Ticket #46694: 46694.diff

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

@@ -34 +34 @@
                 global $wpdb;
                 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 );
                 }
 
                 $upload_dir = wp_get_upload_dir();
@@ -73 +71 @@
                                         ),
                                         'language'               => array(
                                                 'label' => __( 'Language' ),
-                                                'value' => ( ! empty( $locale ) ? $original_locale : get_locale() ),
+                                                'value' => ( ! empty( $locale ) ? $original_locale : get_user_locale() ),
                                         ),
                                         'home_url'               => array(
                                                 'label'   => __( 'Home URL' ),
@@ -888 +886 @@
 
                 if ( ! empty( $locale ) ) {
                         // Change the language used for translations
-                        if ( function_exists( 'restore_previous_locale' ) && $switched_locale ) {
+                        if ( $switched_locale ) {
                                 restore_previous_locale();
                         }
                 }

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

@@ -68 +68 @@
 
         $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' );
         }
         ?>