Changeset 39169 for trunk/src/wp-includes/l10n.php

Timestamp:

11/08/2016 11:00:38 PM (8 years ago)

Author:

swissspidy

Message:

I18N: Add ability to change user's locale back to site's locale.

Previously there was no way to remove the user locale setting again, even though that might be desirable.

This adds a new 'Site Default' option to the user-specific language setting by introducing a new show_site_locale_default argument to wp_dropdown_languages().

Props ocean90.
See #29783.
Fixes #38632.

File:

• trunk/src/wp-includes/l10n.php (modified) (4 diffs)

trunk/src/wp-includes/l10n.php

@@ -1049 +1049 @@
  * @since 4.0.0
  * @since 4.3.0 Introduced the `echo` argument.
+ * @since 4.7.0 Introduced the `show_site_locale_default` argument.
  *
  * @see get_available_languages()
@@ -1066 +1067 @@
  *                                                  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
@@ -1079 +1081 @@
         'echo'         => 1,
         'show_available_translations' => true,
+        'show_site_locale_default'    => false,
     ) );
+
+    // English (United States) uses an empty string for the value attribute.
+    if ( 'en_US' === $args['selected'] ) {
+        $args['selected'] = '';
+    }
 
     $translations = $args['translations'];
@@ -1123 +1131 @@
         $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
     }
-    $structure[] = '<option value="" lang="en" data-installed="1">English (United States)</option>';
+
+    if ( $args['show_site_locale_default'] ) {
+        $structure[] = sprintf(
+            '<option value="site-default" data-installed="1"%s>%s</option>',
+            selected( 'site-default', $args['selected'], false ),
+            _x( 'Site Default', 'default site language' )
+        );
+    }
+
+    $structure[] = sprintf(
+        '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
+        selected( '', $args['selected'], false )
+    );
+
     foreach ( $languages as $language ) {
         $structure[] = sprintf(