Ticket #29783: 29783.6.diff

src/wp-admin/admin-header.php

@@ -156 +156 @@
 $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
 if ( wp_is_mobile() )
         $admin_body_class .= ' mobile';

src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -134 +134 @@
                                 'active_installs' => true
                         ),
                         // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
-                        'locale' => get_locale(),
+                        'locale' => get_user_locale(),
                         'installed_plugins' => $this->get_installed_plugin_slugs(),
                 );
 

src/wp-admin/includes/class-wp-press-this.php

@@ -1312 +1312 @@
         $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
         $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
         $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-        $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+        $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
         /** This filter is documented in wp-admin/admin-header.php */
         $admin_body_classes = apply_filters( 'admin_body_class', '' );

src/wp-admin/includes/credits.php

@@ -16 +16 @@
  */
 function wp_credits() {
         $wp_version = get_bloginfo( 'version' );
-        $locale = get_locale();
+        $locale = get_user_locale();
 
         $results = get_site_transient( 'wordpress_credits_' . $locale );
 

src/wp-admin/includes/dashboard.php

@@ -1353 +1353 @@
                 $notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
 
                 $browsehappy = 'http://browsehappy.com/';
-                $locale = get_locale();
+                $locale = get_user_locale();
                 if ( 'en_US' !== $locale )
                         $browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
 

src/wp-admin/includes/import.php

@@ -125 +125 @@
 function wp_get_popular_importers() {
         include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-        $locale = get_locale();
+        $locale = get_user_locale();
         $cache_key = 'popular_importers_' . md5( $locale . $wp_version );
         $popular_importers = get_site_transient( $cache_key );
 
         if ( ! $popular_importers ) {
                 $url = add_query_arg( array(
-                        'locale'  => get_locale(),
+                        'locale'  => get_user_locale(),
                         'version' => $wp_version,
                 ), 'http://api.wordpress.org/core/importers/1.1/' );
                 $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );

src/wp-admin/includes/plugin-install.php

@@ -109 +109 @@
         }
 
         if ( ! isset( $args->locale ) ) {
-                $args->locale = get_locale();
+                $args->locale = get_user_locale();
         }
 
         /**

src/wp-admin/includes/template.php

@@ -1622 +1622 @@
 /** This action is documented in wp-admin/admin-header.php */
 do_action( 'admin_head' );
 
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
 if ( is_rtl() )
         $admin_body_class .= ' rtl';

src/wp-admin/includes/theme.php

@@ -412 +412 @@
         }
 
         if ( ! isset( $args->locale ) ) {
-                $args->locale = get_locale();
+                $args->locale = get_user_locale();
         }
 
         /**

src/wp-admin/includes/user.php

@@ -94 +94 @@
                 $user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
                 $user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
                 $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+                $user->locale = '';
+
+                if ( isset( $_POST['locale'] ) ) {
+                        $locale = sanitize_text_field( $_POST['locale'] );
+                        if ( ! in_array( $locale, get_available_languages(), true ) ) {
+                                $locale = '';
+                        }
+
+                        $user->locale = ( '' === $locale ) ? 'en_US' : $locale;
+                }
         }
 
         $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';

src/wp-admin/options.php

@@ -209 +209 @@
                         $value = null;
                         if ( isset( $_POST[ $option ] ) ) {
                                 $value = $_POST[ $option ];
-                                if ( ! is_array( $value ) )
+                                if ( ! is_array( $value ) ) {
                                         $value = trim( $value );
+                                }
                                 $value = wp_unslash( $value );
                         }
                         update_option( $option, $value );
                 }
 
                 // Switch translation in case WPLANG was changed.
-                $language = get_option( 'WPLANG' );
-                if ( $language ) {
-                        load_default_textdomain( $language );
-                } else {
-                        unload_textdomain( 'default' );
+                $language      = get_option( 'WPLANG' );
+                $user_language = get_user_locale();
+                if ( $language === $user_language ) {
+                        if ( $language ) {
+                                load_default_textdomain( $language );
+                        } else {
+                                unload_textdomain( 'default' );
+                        }
                 }
         }
 

src/wp-admin/plugin-editor.php

@@ -260 +260 @@
                 <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
                 </div>
                 <?php if ( !empty( $docs_select ) ) : ?>
-                <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" /></div>
+                <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" /></div>
                 <?php endif; ?>
 <?php if ( is_writeable($real_file) ) : ?>
         <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>

src/wp-admin/theme-editor.php

@@ -263 +263 @@
                 <div id="documentation" class="hide-if-no-js">
                 <label for="docs-list"><?php _e('Documentation:') ?></label>
                 <?php echo $docs_select; ?>
-                <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
+                <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
                 </div>
         <?php endif; ?>
 

src/wp-admin/user-edit.php

@@ -269 +269 @@
 </fieldset>
 </td>
 </tr>
+
+<?php
+$languages = get_available_languages();
+if ( $languages ) : ?>
+<tr class="user-language-wrap">
+        <th scope="row">
+                <label for="site_language"><?php _e( 'Site Language' ); ?></label>
+        </th>
+        <td>
+                <?php
+                $user_locale = get_user_option( 'locale', $profileuser->ID );
+
+                if ( 'en_US' === $user_locale ) { // en_US
+                        $user_locale = false;
+                } elseif ( ! in_array( $user_locale, $languages, true ) ) {
+                        $user_locale = get_locale();
+                }
+
+                wp_dropdown_languages( array(
+                        'name'                        => 'locale',
+                        'id'                          => 'locale',
+                        'selected'                    => $user_locale,
+                        'languages'                   => $languages,
+                        'show_available_translations' => false
+                ) );
+                ?>
+        </td>
+</tr>
+<?php
+endif;
+?>
+
 <?php
 /**
  * Fires at the end of the 'Personal Options' settings table on the user editing screen.

src/wp-includes/class-wp-editor.php

@@ -351 +351 @@
                         if ( empty( self::$first_init ) ) {
                                 self::$baseurl = includes_url( 'js/tinymce' );
 
-                                $mce_locale = get_locale();
+                                $mce_locale = get_user_locale();
                                 self::$mce_locale = $mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
 
                                 /** This filter is documented in wp-admin/includes/media.php */
@@ -672 +672 @@
                                 }
                         }
 
-                        $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+                        $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
                         if ( !empty($set['tinymce']['body_class']) ) {
                                 $body_class .= ' ' . $set['tinymce']['body_class'];

src/wp-includes/class-wp-theme.php

@@ -1395 +1395 @@
          * @param array $themes Array of themes to sort, passed by reference.
          */
         public static function sort_by_name( &$themes ) {
-                if ( 0 === strpos( get_locale(), 'en_' ) ) {
+                if ( 0 === strpos( get_user_locale(), 'en_' ) ) {
                         uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
                 } else {
                         uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );

src/wp-includes/class-wp-user.php

@@ -31 +31 @@
  * @property string $display_name
  * @property string $spam
  * @property string $deleted
+ * @property string $locale
  */
 class WP_User {
         /**

src/wp-includes/l10n.php

@@ -76 +76 @@
 }
 
 /**
+ * Retrieves the locale of the current user.
+ *
+ * If the user has a locale set to a non-empty string then it will be
+ * returned. Otherwise it returns the locale of get_locale().
+ *
+ * @since 4.7.0
+ *
+ * @return string The locale of the current user.
+ */
+function get_user_locale() {
+        $user = wp_get_current_user();
+
+        $locale = $user->locale;
+        return ( '' === $locale ) ? get_locale() : $locale;
+}
+
+/**
  * Retrieve the translation of $text.
  *
  * If there is no translation, or the text domain isn't loaded, the original text is returned.
@@ -633 +650 @@
  */
 function load_default_textdomain( $locale = null ) {
         if ( null === $locale ) {
-                $locale = get_locale();
+                $locale = is_admin() ? get_user_locale() : get_locale();
         }
 
         // Unload previously loaded strings so we can switch translations.
@@ -1148 +1165 @@
                 return false;
         }
         return $wp_locale->is_rtl();
-}
- No newline at end of file
+}

src/wp-includes/user.php

@@ -1592 +1592 @@
 
         $meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
 
+        $meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
+
         $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
 
         if ( $user_nicename_check ) {
@@ -1951 +1953 @@
  * @return array List of user keys to be populated in wp_update_user().
  */
 function _get_additional_user_keys( $user ) {
-        $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
+        $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front', 'locale' );
         return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
 }
 

new file tests/phpunit/tests/l10n/getUserLocale.php

@@ +1 @@
+<?php
+
+/**
+ * @group l10n
+ * @group i18n
+ */
+class Tests_Get_User_Locale extends WP_UnitTestCase {
+        protected $user_id;
+
+        public function setUp() {
+                parent::setUp();
+
+                $this->user_id = $this->factory()->user->create( array(
+                        'role'   => 'administrator',
+                        'locale' => 'de_DE',
+                ) );
+
+                wp_set_current_user( $this->user_id );
+        }
+
+        public function tearDown() {
+                delete_user_meta( $this->user_id, 'locale' );
+                set_current_screen( 'front' );
+
+                parent::tearDown();
+        }
+
+        public function test_user_locale_property() {
+                set_current_screen( 'dashboard' );
+                $this->assertSame( 'de_DE', get_user_locale() );
+                $this->assertSame( get_user_by( 'id', $this->user_id )->locale, get_user_locale() );
+        }
+
+        public function test_update_user_locale() {
+                set_current_screen( 'dashboard' );
+                update_user_meta( $this->user_id, 'locale', 'fr_FR' );
+                $this->assertSame( 'fr_FR', get_user_locale() );
+        }
+
+        public function test_returns_site_locale_if_empty() {
+                set_current_screen( 'dashboard' );
+                update_user_meta( $this->user_id, 'locale', '' );
+                $this->assertSame( get_locale(), get_user_locale() );
+        }
+
+        public function test_returns_correct_user_locale() {
+                set_current_screen( 'dashboard' );
+                $this->assertSame( 'de_DE', get_user_locale() );
+        }
+
+        public function test_returns_correct_user_locale_on_frontend() {
+                $this->assertSame( 'de_DE', get_user_locale() );
+        }
+
+        public function test_site_locale_is_not_affected() {
+                set_current_screen( 'dashboard' );
+                $this->assertSame( 'en_US', get_locale() );
+        }
+
+        public function test_site_locale_is_not_affected_on_frontend() {
+                $this->assertSame( 'en_US', get_locale() );
+        }
+
+        public function test_user_locale_is_same_across_network() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires multisite' );
+                }
+
+                $user_locale = get_user_locale();
+
+                switch_to_blog( self::factory()->blog->create() );
+                $user_locale_2 = get_user_locale();
+                restore_current_blog();
+
+                $this->assertSame( 'de_DE', $user_locale );
+                $this->assertSame( $user_locale, $user_locale_2 );
+        }
+}