Ticket #38665: 38665.diff

wp-admin/includes/user.php

@@ -90 +90 @@
                         $user->$method = sanitize_text_field( $_POST[$method] );
         }
 
+        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;
+        }
+
         if ( $update ) {
                 $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' : '';

wp-admin/user-new.php

@@ -422 +422 @@
                 <th scope="row"><label for="url"><?php _e('Website') ?></label></th>
                 <td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
         </tr>
+        <?php
+        $languages = get_available_languages();
+        if ( $languages ) : ?>
+        <tr class="form-field">
+                <th scope="row">
+                        <?php /* translators: The user language selection field label */ ?>
+                        <label for="locale"><?php _e( 'Language' ); ?></label>
+                </th>
+                <td>
+                        <?php
+                        $locale = get_locale();
+
+                        if ( 'en_US' === $locale ) {
+                                $locale = false;
+                        }
+
+                        wp_dropdown_languages( array(
+                                'name'                        => 'locale',
+                                'id'                          => 'locale',
+                                'selected'                    => $locale,
+                                'languages'                   => $languages,
+                                'show_available_translations' => false
+                        ) );
+                        ?>
+                </td>
+        </tr>
+        <?php
+        endif;
+        ?>
         <tr class="form-field form-required user-pass1-wrap">
                 <th scope="row">
                         <label for="pass1">