Ticket #38632: 38632.diff

src/wp-admin/includes/user.php

@@ -98 +98 @@
 
                 if ( isset( $_POST['locale'] ) ) {
                         $locale = sanitize_text_field( $_POST['locale'] );
-                        if ( ! in_array( $locale, get_available_languages(), true ) ) {
+                        if ( 'default' === $locale ) {
                                 $locale = '';
+                        } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+                                $locale = 'en_US';
                         }
 
-                        $user->locale = ( '' === $locale ) ? 'en_US' : $locale;
+                        $user->locale = $locale;
                 }
         }
 

src/wp-admin/user-edit.php

@@ -273 +273 @@
 
 <?php
 $languages = get_available_languages();
-if ( $languages ) : ?>
+if ( $languages ) :
+        $languages = array_merge( array( 'test' ), $languages );
+        ?>
 <tr class="user-language-wrap">
         <th scope="row">
                 <?php /* translators: The user language selection field label */ ?>
@@ -294 +296 @@
                         'id'                          => 'locale',
                         'selected'                    => $user_locale,
                         'languages'                   => $languages,
-                        'show_available_translations' => false
+                        'show_available_translations' => false,
+                        'show_site_locale_default'    => true
                 ) );
                 ?>
         </td>

src/wp-includes/l10n.php

@@ -1065 +1065 @@
  *     @type bool|int $echo                         Whether to echo the generated markup. Accepts 0, 1, or their
  *                                                  boolean equivalents. Default 1.
  *     @type bool     $show_available_translations  Whether to show available translations. Default true.
+ *     @type bool     $show_site_locale_default     Whether to show an option to fall back to the site's locale. Default false.
  * }
  * @return string HTML content
  */
@@ -1078 +1079 @@
                 'selected'     => '',
                 'echo'         => 1,
                 'show_available_translations' => true,
+                'show_site_locale_default' => false,
         ) );
 
         $translations = $args['translations'];
@@ -1122 +1124 @@
         if ( $translations_available ) {
                 $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
         }
+
+        if ( $args['show_site_locale_default'] ) {
+                $lang_code = str_replace( '_', '-', get_locale() );
+                list( $lang_code ) = explode( '-', $lang_code );
+                $structure[] = sprintf( '<option value="default" lang="%1$s" data-installed="1">%2$s</option>', $lang_code, __( 'Site Default' ) );
+        }
+
         $structure[] = '<option value="" lang="en" data-installed="1">English (United States)</option>';
+
         foreach ( $languages as $language ) {
                 $structure[] = sprintf(
                         '<option value="%s" lang="%s"%s data-installed="1">%s</option>',