Changeset 52058

Timestamp:

11/08/2021 10:36:11 PM (4 weeks 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.

Location:

trunk/src

Files:

• wp-admin/css/login.css (modified) (4 diffs)
• wp-includes/l10n.php (modified) (6 diffs)
• wp-includes/user.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

trunk/src/wp-admin/css/login.css

@@ -282 +282 @@
 #login {
     width: 320px;
-    padding: 8% 0 0;
+    padding: 5% 0 0;
     margin: auto;
 }
@@ -322 +322 @@
     text-align: center;
     width: 100%;
-    margin: 5em 0 2em;
+    margin: 3em 0 2em;
 }
 
@@ -410 +410 @@
 }
 
+#language-switcher {
+    padding: 0;
+    overflow: visible;
+    background: none;
+    border: none;
+    box-shadow: none;
+}
+
+#language-switcher select {
+    margin-right: 0.25em;
+}
+
+.language-switcher {
+    margin: 0 auto;
+    padding: 0 0 24px;
+    text-align: center;
+}
+
+.language-switcher label {
+    margin-right: 0.25em;
+}
+
+.language-switcher label .dashicons {
+    width: auto;
+    height: auto;
+}
+
+.login .language-switcher .button-primary {
+    float: none;
+    margin-bottom: 0;
+}
+
 @media screen and (max-height: 550px) {
     #login {
         padding: 20px 0;
+    }
+
+    #language-switcher {
+        margin-top: 0;
     }
 }
@@ -428 +464 @@
         margin: -0.1875rem 0 0 -0.25rem;
     }
-}
+
+    #language-switcher label,
+    #language-switcher select {
+        margin-right: 0;
+    }
+}
+
+@media screen and (max-width: 400px) {
+    .login .language-switcher .button-primary {
+        display: block;
+        margin: 5px auto 0;
+    }
+}

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 )
         );

trunk/src/wp-includes/user.php

@@ -3045 +3045 @@
     update_user_meta( $user_id, 'default_password_nag', true ); // Set up the password change nag.
 
+    if ( ! empty( $_COOKIE['wp_lang'] ) ) {
+        $wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
+        if ( in_array( $wp_lang, get_available_languages(), true ) ) {
+            update_user_meta( $user_id, 'locale', $wp_lang ); // Set user locale if defined on registration.
+        }
+    }
+
     /**
      * Fires after a new user registration has been recorded.

trunk/src/wp-login.php

@@ -313 +313 @@
 
     <?php
+    $languages = get_available_languages();
+
+    if ( ! empty( $languages ) && ! $interim_login ) { ?>
+
+        <div class="language-switcher">
+            <form id="language-switcher" action="" method="get">
+
+                <label for="language-switcher-locales">
+                    <span class="dashicons dashicons-translation" aria-hidden="true"></span>
+                    <span class="screen-reader-text"><?php _e( 'Language' ); ?></span>
+                </label>
+
+                <?php
+                    $args = array(
+                        'id'                          => 'language-switcher-locales',
+                        'name'                        => 'wp_lang',
+                        'selected'                    => determine_locale(),
+                        'show_available_translations' => false,
+                        'explicit_option_en_us'       => true,
+                        'languages'                   => $languages,
+                    );
+
+                    /**
+                     * Filters default arguments for the Languages select input on the login screen.
+                     *
+                     * @since 5.9.0
+                     *
+                     * @param array $args Arguments for the Languages select input on the login screen.
+                     */
+                    wp_dropdown_languages( apply_filters( 'wp_login_language_switcher_args', $args ) );
+                ?>
+
+                <?php if ( $interim_login ) { ?>
+                    <input type="hidden" name="interim-login" value="1" />
+                <?php } ?>
+
+                <?php if ( isset( $_GET['redirect_to'] ) && '' !== $_GET['redirect_to'] ) { ?>
+                    <input type="hidden" name="redirect_to" value="<?php echo esc_url_raw( $_GET['redirect_to'] ); ?>" />
+                <?php } ?>
+
+                <?php if ( isset( $_GET['action'] ) && '' !== $_GET['action'] ) { ?>
+                    <input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action'] ); ?>" />
+                <?php } ?>
+
+                    <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Change' ); ?>">
+
+                </form>
+            </div>
+
+<?php } ?>
+
+    <?php
 
     if ( ! empty( $input_id ) ) {
@@ -418 +470 @@
 if ( SITECOOKIEPATH !== COOKIEPATH ) {
     setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
+}
+
+if ( isset( $_GET['wp_lang'] ) ) {
+    setcookie( 'wp_lang', sanitize_text_field( $_GET['wp_lang'] ), 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
 }