From 054610e27676b55b966588645ec8f35e2813c7d4 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 3 Jul 2020 21:59:03 +0000 Subject: [PATCH] Text Changes: Remove use of "normal" in user-facing output. This clarifies some messages referring to Site Health checks and maintenance mode, and makes them more accurate. Props dartiss. Fixes #50549. Built from https://develop.svn.wordpress.org/trunk@48287 git-svn-id: http://core.svn.wordpress.org/trunk@48056 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-site-health.php | 8 ++++---- wp-admin/update-core.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index 801707d2f0..2b48212d32 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -215,7 +215,7 @@ class WP_Site_Health { * It's possible to block updates with the `wp_version_check` filter, but this can't be checked * during an Ajax call, as the filter is never introduced then. * - * This filter overrides a normal page request if it's made by an admin through the Ajax call + * This filter overrides a standard page request if it's made by an admin through the Ajax call * with the right query argument to check for this. * * @since 5.2.0 @@ -692,7 +692,7 @@ class WP_Site_Health { $result['description'] .= sprintf( '

%s

', - __( 'Your site does not have any default theme. Default themes are used by WordPress automatically if anything is wrong with your normal theme.' ) + __( 'Your site does not have any default theme. Default themes are used by WordPress automatically if anything is wrong with your chosen theme.' ) ); } @@ -981,7 +981,7 @@ class WP_Site_Health { // If this module is a fallback for another function, check if that other function passed. if ( isset( $module['fallback_for'] ) ) { /* - * If that other function has a failure, mark this module as required for normal operations. + * If that other function has a failure, mark this module as required for usual operations. * If that other function hasn't failed, skip this test as it's only a fallback. */ if ( isset( $failures[ $module['fallback_for'] ] ) ) { @@ -1453,7 +1453,7 @@ class WP_Site_Health { '

%s

', sprintf( /* translators: %s: WP_DEBUG_LOG */ - __( 'The value, %s, has been added to this website’s configuration file. This means any errors on the site will be written to a file which is potentially available to normal users.' ), + __( 'The value, %s, has been added to this website’s configuration file. This means any errors on the site will be written to a file which is potentially available to all users.' ), 'WP_DEBUG_LOG' ) ); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 84547f9ed2..57b1619150 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -274,7 +274,7 @@ function core_upgrade_preamble() { echo ''; // Don't show the maintenance mode notice when we are only showing a single re-install option. if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) { - echo '

' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '

'; + echo '

' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '

'; } elseif ( ! $updates ) { list( $normalized_version ) = explode( '-', $wp_version ); echo '

' . sprintf( diff --git a/wp-includes/version.php b/wp-includes/version.php index 5205d2abaf..a740d534f2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-48286'; +$wp_version = '5.5-alpha-48287'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.