From 1f5fcff132c1a509c3fd35435996e040fc4eadb2 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 19 Jul 2019 00:09:58 +0000 Subject: [PATCH] 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 --- wp-admin/about.php | 14 ++++++++++---- wp-admin/credits.php | 14 ++++++++++---- wp-admin/freedoms.php | 35 ++++++++++++++++++++++++++--------- wp-admin/privacy.php | 28 ++++++++++++++++++++-------- wp-includes/version.php | 2 +- 5 files changed, 67 insertions(+), 26 deletions(-) diff --git a/wp-admin/about.php b/wp-admin/about.php index 60f848934b..9dbed2ee3f 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

@@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 8c47501895..4ec9424ce1 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -20,8 +20,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

@@ -37,8 +40,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index 142b878214..e860ebbe83 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -26,8 +26,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

@@ -43,8 +46,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -60,8 +66,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

license, 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 license, the GPL.' ), + __( 'https://wordpress.org/about/license/' ) + ); ?>

@@ -92,17 +101,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

check out our trademark guidelines 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’re flattered every time someone spreads the good word, just make sure to check out our trademark guidelines first.' ), + 'https://wordpressfoundation.org/trademark-policy/' + ); ?>

plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, __( 'https://wordpress.org/about/license/' ) ); + __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), + $plugins_url, + $themes_url, + __( 'https://wordpress.org/about/license/' ) + ); ?>

diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php index b2edbc4414..ca2a9e0cba 100644 --- a/wp-admin/privacy.php +++ b/wp-admin/privacy.php @@ -19,8 +19,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

@@ -36,8 +39,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -53,15 +59,21 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

WordPress.org stats page.' ), __( '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 WordPress.org stats page.' ), + __( 'https://wordpress.org/about/stats/' ) + ); ?>

WordPress.org/about/privacy.' ), __( '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 WordPress.org/about/privacy.' ), + __( 'https://wordpress.org/about/privacy/' ) + ); ?>

diff --git a/wp-includes/version.php b/wp-includes/version.php index 16493dc4eb..8128f972c7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.