<!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>[53501] trunk/src: I18N: Use a translatable string for displaying a user's first name and last name.</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/53501">53501</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/53501","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-06-14 14:41:10 +0000 (Tue, 14 Jun 2022)</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: Use a translatable string for displaying a user's first name and last name.
That allows locales to switch the order of the first name and last name, should they prefer to do so.
The string was previously used in `wp_insert_user()` and is now reused in other places for consistency:
* `WP_MS_Users_List_Table::column_name()`{U+200B}
* `WP_Users_List_Table::column_name(){U+200B}`
* `wp_list_authors()`
* `wp_list_users()`
Note: This also removes the `wp_list_author_full_name` filter, introduced for the same purpose in `wp_list_authors()`, as redundant for now.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53486">[53486]</a>.
See <a href="https://core.trac.wordpress.org/ticket/17025">#17025</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpincludesauthortemplatephp">trunk/src/wp-includes/author-template.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2022-06-14 14:36:29 UTC (rev 53500)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2022-06-14 14:41:10 UTC (rev 53501)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_name( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->first_name && $user->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "$user->first_name $user->last_name";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $user->first_name,
+ $user->last_name
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user->first_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $user->first_name;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user->last_name ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2022-06-14 14:36:29 UTC (rev 53500)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2022-06-14 14:41:10 UTC (rev 53501)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,7 +568,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'name':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_object->first_name && $user_object->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "$user_object->first_name $user_object->last_name";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= sprintf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $user_object->first_name,
+ $user_object->last_name
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_object->first_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= $user_object->first_name;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_object->last_name ) {
</span></span></pre></div>
<a id="trunksrcwpincludesauthortemplatephp"></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/author-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/author-template.php 2022-06-14 14:36:29 UTC (rev 53500)
+++ trunk/src/wp-includes/author-template.php 2022-06-14 14:41:10 UTC (rev 53501)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,20 +476,12 @@
</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 ( $args['show_fullname'] && $author->first_name && $author->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $full_name = $author->first_name . ' ' . $author->last_name;
-
- /**
- * Filters the author's full name.
- *
- * @since 6.1.0
- *
- * @param string $full_name Full Name of the author. Default: The author's first name
- * and last name, separated by a space.
- * @param object $author Author object.
- */
- $name = apply_filters( 'wp_list_author_full_name', $full_name, $author );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = sprintf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $author->first_name,
+ $author->last_name
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $author->display_name;
</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 2022-06-14 14:36:29 UTC (rev 53500)
+++ trunk/src/wp-includes/user.php 2022-06-14 14:41:10 UTC (rev 53501)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,7 +827,12 @@
</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 ( $args['show_fullname'] && '' !== $user->first_name && '' !== $user->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = "$user->first_name $user->last_name";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = sprintf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $user->first_name,
+ $user->last_name
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $user->display_name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2242,8 +2247,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $display_name = $user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $meta['first_name'] && $meta['last_name'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: User's first name, 2: Last name. */
- $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $display_name = sprintf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $meta['first_name'],
+ $meta['last_name']
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $meta['first_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $display_name = $meta['first_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $meta['last_name'] ) {
</span></span></pre>
</div>
</div>
</body>
</html>