From 9510aaecde8cd6ac4c154f9b50d7ea0d6dc92f57 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 23 Sep 2019 19:39:58 +0000 Subject: [PATCH] Site Health: Improve wording for PHP update warning. Props danieltj, garrett-eclipse, marybaum, afragen, chetan200891. Fixes #47644. Built from https://develop.svn.wordpress.org/trunk@46267 git-svn-id: http://core.svn.wordpress.org/trunk@46079 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-site-health.php | 30 +++++++++++++++++----- wp-includes/version.php | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index 4e5b3c3bcc..d910a6be0a 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -260,7 +260,7 @@ class WP_Site_Health { $result['status'] = 'good'; $result['label'] = sprintf( /* translators: %s: The current version of WordPress installed on this site. */ - __( 'Your WordPress version is up to date (%s)' ), + __( 'Your version of WordPress (%s) is up to date' ), $core_current_version ); @@ -654,7 +654,7 @@ class WP_Site_Health { $result = array( 'label' => sprintf( /* translators: %s: The current PHP version. */ - __( 'PHP is up to date (%s)' ), + __( 'Your version of PHP (%s) is up to date' ), PHP_VERSION ), 'status' => 'good', @@ -664,7 +664,11 @@ class WP_Site_Health { ), 'description' => sprintf( '

%s

', - __( 'PHP is the programming language we use to build and maintain WordPress. Newer versions of PHP are both faster and more secure, so updating will have a positive effect on your site’s performance.' ) + sprintf( + /* translators: %s: The minimum recommended PHP version. */ + __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are faster and more secure, so staying up to date will help your site’s overall performance and security. The minimum recommended version of PHP is %s.' ), + $response['recommended_version'] + ) ), 'actions' => sprintf( '

%s %s

', @@ -681,9 +685,13 @@ class WP_Site_Health { return $result; } - // The PHP version is older than the recommended version, but still acceptable. + // The PHP version is older than the recommended version, but still receiving active support. if ( $response['is_supported'] ) { - $result['label'] = __( 'We recommend that you update PHP' ); + $result['label'] = sprintf( + /* translators: %s: The server PHP version. */ + __( 'Your version of PHP (%s) is out of date' ), + PHP_VERSION + ); $result['status'] = 'recommended'; return $result; @@ -691,14 +699,22 @@ class WP_Site_Health { // The PHP version is only receiving security fixes. if ( $response['is_secure'] ) { - $result['label'] = __( 'Your PHP version should be updated' ); + $result['label'] = sprintf( + /* translators: %s: The server PHP version. */ + __( 'Your version of PHP (%s) should be updated' ), + PHP_VERSION + ); $result['status'] = 'recommended'; return $result; } // Anything no longer secure must be updated. - $result['label'] = __( 'Your PHP version requires an update' ); + $result['label'] = sprintf( + /* translators: %s: The server PHP version. */ + __( 'Your version of PHP (%s) requires an update' ), + PHP_VERSION + ); $result['status'] = 'critical'; $result['badge']['label'] = __( 'Security' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 88e0a0a1f4..5d1c0fbe23 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-46266'; +$wp_version = '5.3-alpha-46267'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.