WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Improve spacing of `printf()` calls in the admin About pages. 

Props garrett-eclipse.
Fixes #47734.


Built from https://develop.svn.wordpress.org/trunk@45660


git-svn-id: http://core.svn.wordpress.org/trunk@45471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-07-19 00:09:58 +00:00
parent 1c331e8931
commit 1f5fcff132
5 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/about.php
View File

@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wrap about-wrap full-width-layout"> <div class="wrap about-wrap full-width-layout">
<h1> <h1>
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?> ?>
</h1> </h1>
@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"> <div class="wp-badge">
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Version %s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?> ?>
</div> </div>

14
wp-admin/credits.php
View File

@ -20,8 +20,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1> <h1>
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?> ?>
</h1> </h1>
@ -37,8 +40,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"> <div class="wp-badge">
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Version %s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?> ?>
</div> </div>

35
wp-admin/freedoms.php
View File

@ -26,8 +26,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1> <h1>
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?> ?>
</h1> </h1>
@ -43,8 +46,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"> <div class="wp-badge">
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Version %s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?> ?>
</div> </div>
@ -60,8 +66,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h2><?php _e( 'Freedoms' ); ?></h2> <h2><?php _e( 'Freedoms' ); ?></h2>
<p class="about-description"> <p class="about-description">
<?php <?php
printf(
/* translators: %s: https://wordpress.org/about/license/ */ /* translators: %s: https://wordpress.org/about/license/ */
printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), __( 'https://wordpress.org/about/license/' ) ); __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ),
__( 'https://wordpress.org/about/license/' )
);
?> ?>
</p> </p>
</div> </div>
@ -92,17 +101,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="feature-section has-1-columns"> <div class="feature-section has-1-columns">
<p> <p>
<?php <?php
printf(
/* translators: %s: https://wordpressfoundation.org/trademark-policy/ */ /* translators: %s: https://wordpressfoundation.org/trademark-policy/ */
printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ),
'https://wordpressfoundation.org/trademark-policy/'
);
?> ?>
</p> </p>
<p> <p>
<?php <?php
$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' ); $plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' ); $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
printf(
/* translators: %s: https://wordpress.org/about/license/ */ /* translators: %s: https://wordpress.org/about/license/ */
printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, __( 'https://wordpress.org/about/license/' ) ); __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ),
$plugins_url,
$themes_url,
__( 'https://wordpress.org/about/license/' )
);
?> ?>
</p> </p>

28
wp-admin/privacy.php
View File

@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1> <h1>
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?> ?>
</h1> </h1>
@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"> <div class="wp-badge">
<?php <?php
/* translators: %s: The current WordPress version number */ printf(
printf( __( 'Version %s' ), $display_version ); /* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?> ?>
</div> </div>
@ -53,15 +59,21 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<p> <p>
<?php <?php
/* translators: %s: https://wordpress.org/about/stats/ */ printf(
printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), __( 'https://wordpress.org/about/stats/' ) ); /* translators: %s: https://wordpress.org/about/stats/ */
__( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ),
__( 'https://wordpress.org/about/stats/' )
);
?> ?>
</p> </p>
<p> <p>
<?php <?php
/* translators: %s: https://wordpress.org/about/privacy/ */ printf(
printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), __( 'https://wordpress.org/about/privacy/' ) ); /* translators: %s: https://wordpress.org/about/privacy/ */
__( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ),
__( 'https://wordpress.org/about/privacy/' )
);
?> ?>
</p> </p>
</div> </div>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45659'; $wp_version = '5.3-alpha-45660';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.