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

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
This commit is contained in:
Sergey Biryukov 2020-07-03 21:59:03 +00:00
parent 6a889c150d
commit 054610e276
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/class-wp-site-health.php
View File

@ -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 * 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. * 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. * with the right query argument to check for this.
* *
* @since 5.2.0 * @since 5.2.0
@ -692,7 +692,7 @@ class WP_Site_Health {
$result['description'] .= sprintf( $result['description'] .= sprintf(
'<p>%s</p>', '<p>%s</p>',
__( '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 this module is a fallback for another function, check if that other function passed.
if ( isset( $module['fallback_for'] ) ) { 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 that other function hasn't failed, skip this test as it's only a fallback.
*/ */
if ( isset( $failures[ $module['fallback_for'] ] ) ) { if ( isset( $failures[ $module['fallback_for'] ] ) ) {
@ -1453,7 +1453,7 @@ class WP_Site_Health {
'<p>%s</p>', '<p>%s</p>',
sprintf( sprintf(
/* translators: %s: WP_DEBUG_LOG */ /* translators: %s: WP_DEBUG_LOG */
__( 'The value, %s, has been added to this website&#8217;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&#8217;s configuration file. This means any errors on the site will be written to a file which is potentially available to all users.' ),
'<code>WP_DEBUG_LOG</code>' '<code>WP_DEBUG_LOG</code>'
) )
); );

2
wp-admin/update-core.php
View File

@ -274,7 +274,7 @@ function core_upgrade_preamble() {
echo '</ul>'; echo '</ul>';
// Don't show the maintenance mode notice when we are only showing a single re-install option. // 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 ) ) { if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) {
echo '<p>' . __( '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.' ) . '</p>'; echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '</p>';
} elseif ( ! $updates ) { } elseif ( ! $updates ) {
list( $normalized_version ) = explode( '-', $wp_version ); list( $normalized_version ) = explode( '-', $wp_version );
echo '<p>' . sprintf( echo '<p>' . sprintf(

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.