Ticket #29783: 29783.patch

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->site_language = isset( $_POST['site_language'] ) ? $_POST['site_language'] : 'default';
         }
 
         $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';

src/wp-admin/options-general.php

@@ -340 +340 @@
                 <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
                 <td>
                         <?php
-                        $locale = get_locale();
+                        add_filter( 'get_user_option_site_language', '__return_false' );
+                        $locale = get_locale( false );
+                        remove_filter( 'get_user_option_site_language', '__return_false' );
                         if ( ! in_array( $locale, $languages ) ) {
                                 $locale = '';
                         }

src/wp-admin/user-edit.php

@@ -291 +291 @@
 </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
+                $lang = get_user_option( 'site_language', $profileuser->ID );
+                if ( '' === $lang ) { // en_US
+                        $lang = false;
+                } elseif ( 'default' === $lang || ! in_array( $lang, $languages ) ) {
+                        $lang = get_locale();
+                }
+
+                wp_dropdown_languages( array(
+                        'name'         => 'site_language',
+                        'id'           => 'site_language',
+                        'selected'     => $lang,
+                        'languages'    => $languages,
+                        'show_available_translations' => false
+                ) );
+                ?>
+        </td>
+</tr>
+<?php
+endif;
+
 /**
  * Fires at the end of the 'Personal Options' settings table on the user editing screen.
  *

src/wp-includes/l10n.php

@@ -21 +21 @@
  *
  * @since 1.5.0
  *
+ * @param  bool   $cached Whether to return the cached locale. Default true.
  * @return string The locale of the blog or from the 'locale' hook.
  */
-function get_locale() {
+function get_locale( $cached = true ) {
         global $locale, $wp_local_package;
 
-        if ( isset( $locale ) ) {
+        if ( $cached && isset( $locale ) ) {
                 /**
                  * Filter WordPress install's locale ID.
                  *
@@ -63 +64 @@
                 }
         }
 
+        if ( is_user_logged_in() ) {
+                $user_language = get_user_option( 'site_language', get_current_user_id() );
+
+                if ( false !== $user_language && 'default' !== $user_language ) {
+                        $locale = $user_language;
+                }
+        }
+
         if ( empty( $locale ) ) {
                 $locale = 'en_US';
         }

src/wp-includes/user.php

@@ -1869 +1869 @@
 
         $meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
 
+        $meta['site_language'] = isset( $userdata['site_language'] ) ? $userdata['site_language']: 'default';
+
         $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 ) {
@@ -2041 +2043 @@
  * @return array
  */
 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', 'site_language' );
         return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
 }