<!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>[47516] trunk/src/wp-admin: Users: Add a user language preference option to the "Add New User" form.</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/47516">47516</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/47516","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-27 21:56:24 +0000 (Fri, 27 Mar 2020)</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'>Users: Add a user language preference option to the "Add New User" form.

This uses the same language selection control as the user editing screen and allows new users to be invited to a site in their own language.

Props barryceelen, johnbillion

Fixes <a href="https://core.trac.wordpress.org/ticket/38665">#38665</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesuserphp"></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/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php      2020-03-27 18:20:55 UTC (rev 47515)
+++ trunk/src/wp-admin/includes/user.php        2020-03-27 21:56:24 UTC (rev 47516)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,6 +112,19 @@
</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"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ( isset( $_POST['locale'] ) ) {
+               $locale = sanitize_text_field( $_POST['locale'] );
+               if ( 'site-default' === $locale ) {
+                       $locale = '';
+               } elseif ( '' === $locale ) {
+                       $locale = 'en_US';
+               } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+                       $locale = '';
+               }
+
+               $user->locale = $locale;
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
</span><span class="cx" style="display: block; padding: 0 10px">                $user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,19 +131,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
</span><span class="cx" style="display: block; padding: 0 10px">                $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
</span><span class="cx" style="display: block; padding: 0 10px">                $user->locale               = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-               if ( isset( $_POST['locale'] ) ) {
-                       $locale = sanitize_text_field( $_POST['locale'] );
-                       if ( 'site-default' === $locale ) {
-                               $locale = '';
-                       } elseif ( '' === $locale ) {
-                               $locale = 'en_US';
-                       } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
-                               $locale = '';
-                       }
-
-                       $user->locale = $locale;
-               }
</del><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">        $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php   2020-03-27 18:20:55 UTC (rev 47515)
+++ trunk/src/wp-admin/user-new.php     2020-03-27 21:56:24 UTC (rev 47516)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,6 +498,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <th scope="row"><label for="url"><?php _e( 'Website' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px">                <td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px">        </tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        <?php
+       $languages = get_available_languages();
+       if ( $languages ) : ?>
+               <tr class="form-field user-language-wrap">
+                       <th scope="row">
+                               <label for="locale">
+                                       <?php /* translators: The user language selection field label */ ?>
+                                       <?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span>
+                               </label>
+                       </th>
+                       <td>
+                               <?php
+                               wp_dropdown_languages( array(
+                                       'name'                        => 'locale',
+                                       'id'                          => 'locale',
+                                       'selected'                    => 'site-default',
+                                       'languages'                   => $languages,
+                                       'show_available_translations' => false,
+                                       'show_option_site_default'    => true,
+                               ) );
+                               ?>
+                       </td>
+               </tr>
+       <?php
+       endif;
+       ?>
</ins><span class="cx" style="display: block; padding: 0 10px">         <tr class="form-field form-required user-pass1-wrap">
</span><span class="cx" style="display: block; padding: 0 10px">                <th scope="row">
</span><span class="cx" style="display: block; padding: 0 10px">                        <label for="pass1">
</span></span></pre>
</div>
</div>

</body>
</html>