Skip to content

Commit

Permalink
Coding Standards: Improve spacing of printf() calls in the admin Ab…
Browse files Browse the repository at this point in the history
…out 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
  • Loading branch information
pento committed Jul 19, 2019
1 parent 1c331e8 commit 1f5fcff
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 26 deletions.
14 changes: 10 additions & 4 deletions wp-admin/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
<div class="wrap about-wrap full-width-layout">
<h1>
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?>
</h1>

Expand All @@ -36,8 +39,11 @@

<div class="wp-badge">
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Version %s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?>
</div>

Expand Down
14 changes: 10 additions & 4 deletions wp-admin/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@

<h1>
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?>
</h1>

Expand All @@ -37,8 +40,11 @@

<div class="wp-badge">
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Version %s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?>
</div>

Expand Down
35 changes: 26 additions & 9 deletions wp-admin/freedoms.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@

<h1>
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?>
</h1>

Expand All @@ -43,8 +46,11 @@

<div class="wp-badge">
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Version %s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?>
</div>

Expand All @@ -60,8 +66,11 @@
<h2><?php _e( 'Freedoms' ); ?></h2>
<p class="about-description">
<?php
printf(
/* 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>
</div>
Expand Down Expand Up @@ -92,17 +101,25 @@
<div class="feature-section has-1-columns">
<p>
<?php
printf(
/* 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>
<?php
$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/' );
$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/' );
printf(
/* 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>

Expand Down
28 changes: 20 additions & 8 deletions wp-admin/privacy.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@

<h1>
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Welcome to WordPress&nbsp;%s' ),
$display_version
);
?>
</h1>

Expand All @@ -36,8 +39,11 @@

<div class="wp-badge">
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Version %s' ), $display_version );
printf(
/* translators: %s: The current WordPress version number */
__( 'Version %s' ),
$display_version
);
?>
</div>

Expand All @@ -53,15 +59,21 @@

<p>
<?php
/* translators: %s: https://wordpress.org/about/stats/ */
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/' ) );
printf(
/* 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>
<?php
/* translators: %s: https://wordpress.org/about/privacy/ */
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/' ) );
printf(
/* 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>
</div>
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @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.
Expand Down

0 comments on commit 1f5fcff

Please sign in to comment.