<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[52058] trunk/src: I18N: Add language switcher on login/registration screens.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/52058">52058</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/52058","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-08 22:36:11 +0000 (Mon, 08 Nov 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/43700">#43700</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsslogincss">trunk/src/wp-admin/css/login.css</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsslogincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/login.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/login.css 2021-11-08 22:30:41 UTC (rev 52057)
+++ trunk/src/wp-admin/css/login.css 2021-11-08 22:36:11 UTC (rev 52058)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #login {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 320px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 8% 0 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 5% 0 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .login .privacy-policy-page-link {
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 5em 0 2em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 3em 0 2em;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .login form .input,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,10 +409,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#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;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and (max-height: 550px) {
</span><span class="cx" style="display: block; padding: 0 10px"> #login {
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 20px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ #language-switcher {
+ margin-top: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,4 +463,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 1.3125rem;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: -0.1875rem 0 0 -0.25rem;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ #language-switcher label,
+ #language-switcher select {
+ margin-right: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+@media screen and (max-width: 400px) {
+ .login .language-switcher .button-primary {
+ display: block;
+ margin: 5px auto 0;
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2021-11-08 22:30:41 UTC (rev 52057)
+++ trunk/src/wp-includes/l10n.php 2021-11-08 22:36:11 UTC (rev 52058)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,10 +144,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $determined_locale = get_user_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_GET['wp_lang'] ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
- $determined_locale = sanitize_text_field( $_GET['wp_lang'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+ $determined_locale = $wp_lang;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the locale for the current request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1480,6 +1488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 Introduced the `echo` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Introduced the `show_option_site_default` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0 Introduced the `show_option_en_us` argument.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Introduced the `explicit_option_en_us` argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_available_languages()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_get_available_translations()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1499,6 +1508,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $show_available_translations Whether to show available translations. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $show_option_site_default Whether to show an option to fall back to the site's locale. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $show_option_en_us Whether to show an option for English (United States). Default true.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML dropdown list of languages.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1516,6 +1527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_available_translations' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_option_site_default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_option_en_us' => true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'explicit_option_en_us' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1525,7 +1537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // English (United States) uses an empty string for the value attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'en_US' === $parsed_args['selected'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' === $parsed_args['selected'] && ! $parsed_args['explicit_option_en_us'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['selected'] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1580,8 +1592,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['show_option_en_us'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = ( $parsed_args['explicit_option_en_us'] ) ? 'en_US' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $structure[] = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<option value="%s" lang="en" data-installed="1"%s>English (United States)</option>',
+ esc_attr( $value ),
</ins><span class="cx" style="display: block; padding: 0 10px"> selected( '', $parsed_args['selected'], false )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2021-11-08 22:30:41 UTC (rev 52057)
+++ trunk/src/wp-includes/user.php 2021-11-08 22:36:11 UTC (rev 52058)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3044,6 +3044,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $user_id, 'default_password_nag', true ); // Set up the password change nag.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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.
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a new user registration has been recorded.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2021-11-08 22:30:41 UTC (rev 52057)
+++ trunk/src/wp-login.php 2021-11-08 22:36:11 UTC (rev 52058)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,59 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><?php // End of <div id="login">. ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $languages = get_available_languages();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $input_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,6 +471,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['wp_lang'] ) ) {
+ setcookie( 'wp_lang', sanitize_text_field( $_GET['wp_lang'] ), 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when the login form is initialized.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>