Changeset 45110

Timestamp:

04/04/2019 09:23:29 PM (6 years ago)

Author:

desrosj

Message:

Site Health: Ensure the user locale is listed in debug information.

This change switches to using get_user_locale() when adding the language to the Site Health debug information to ensure the user’s locale preference is reflected.

Also, function_exists() checks for switch_to_locale() and restore_previous_locale() were required in the plugin to support older versions of WordPress, but they are not required in core/

Props: Clorith, desrosj.
Fixes #46694.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-debug-data.php (modified) (3 diffs)
• site-health-info.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -35 +35 @@
         if ( ! empty( $locale ) ) {
             // Change the language used for translations
-            if ( function_exists( 'switch_to_locale' ) ) {
-                $original_locale = get_locale();
-                $switched_locale = switch_to_locale( $locale );
-            }
+            $original_locale = get_user_locale();
+            $switched_locale = switch_to_locale( $locale );
         }
 
@@ -74 +72 @@
                     'language'               => array(
                         'label' => __( 'Language' ),
-                        'value' => ( ! empty( $locale ) ? $original_locale : get_locale() ),
+                        'value' => ( ! empty( $locale ) ? $original_locale : get_user_locale() ),
                     ),
                     'home_url'               => array(
@@ -889 +887 @@
         if ( ! empty( $locale ) ) {
             // Change the language used for translations
-            if ( function_exists( 'restore_previous_locale' ) && $switched_locale ) {
+            if ( $switched_locale ) {
                 restore_previous_locale();
             }

trunk/src/wp-admin/site-health-info.php

@@ -69 +69 @@
     $info         = WP_Debug_Data::debug_data();
     $english_info = '';
-    if ( 0 !== strpos( get_locale(), 'en' ) ) {
+    if ( 0 !== strpos( get_user_locale(), 'en' ) ) {
         $english_info = WP_Debug_Data::debug_data( 'en_US' );
     }