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

Timestamp:

11/08/2021 10:36:11 PM (2 years ago)

Author:

joedolson

Message:

I18N: Add language switcher on login/registration screens.

Load a language switcher on the login and registration screens that allows users to choose any already-installed language. Set user locale on registration.

Props johnbillion, Nikschavan, afercia, sabernhardt, garrett-eclipse, keyur5, paaljoachim, Clorith, tobifjellner.
Fixes #43700.

File:

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

trunk/src/wp-includes/l10n.php

@@ -145 +145 @@
     }
 
-    if ( ! empty( $_GET['wp_lang'] ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
-        $determined_locale = sanitize_text_field( $_GET['wp_lang'] );
+    $wp_lang = '';
+
+    if ( ! empty( $_GET['wp_lang'] ) ) {
+        $wp_lang = sanitize_text_field( $_GET['wp_lang'] );
+    } elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
+        $wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
+    }
+
+    if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+        $determined_locale = $wp_lang;
     }
 
@@ -1481 +1489 @@
  * @since 4.7.0 Introduced the `show_option_site_default` argument.
  * @since 5.1.0 Introduced the `show_option_en_us` argument.
+ * @since 5.9.0 Introduced the `explicit_option_en_us` argument.
  *
  * @see get_available_languages()
@@ -1500 +1509 @@
  *     @type bool     $show_option_site_default     Whether to show an option to fall back to the site's locale. Default false.
  *     @type bool     $show_option_en_us            Whether to show an option for English (United States). Default true.
+ *     @type bool     $explicit_option_en_us        Whether the English (United States) option uses an explict value of en_US
+ *                                                  instead of an empty value. Default false.
  * }
  * @return string HTML dropdown list of languages.
@@ -1517 +1528 @@
             'show_option_site_default'    => false,
             'show_option_en_us'           => true,
+            'explicit_option_en_us'       => false,
         )
     );
@@ -1526 +1538 @@
 
     // English (United States) uses an empty string for the value attribute.
-    if ( 'en_US' === $parsed_args['selected'] ) {
+    if ( 'en_US' === $parsed_args['selected'] && ! $parsed_args['explicit_option_en_us'] ) {
         $parsed_args['selected'] = '';
     }
@@ -1581 +1593 @@
 
     if ( $parsed_args['show_option_en_us'] ) {
+        $value = ( $parsed_args['explicit_option_en_us'] ) ? 'en_US' : '';
         $structure[] = sprintf(
-            '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
+            '<option value="%s" lang="en" data-installed="1"%s>English (United States)</option>',
+            esc_attr( $value ),
             selected( '', $parsed_args['selected'], false )
         );