mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-11 10:30:44 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

I18N: Use a translatable string for displaying a user's first name and last name.

Browse Source 
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()`​
* `WP_Users_List_Table::column_name()​`
* `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 [53486].

See #17025.

git-svn-id: https://develop.svn.wordpress.org/trunk@53501 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-06-14 14:41:10 +00:00
parent d60f4f9cab
commit 2d9073413f
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-admin/includes/class-wp-ms-users-list-table.php
View File

@ -302,7 +302,12 @@ class WP_MS_Users_List_Table extends WP_List_Table {
*/
public function column_name( $user ) {
if ( $user->first_name && $user->last_name ) {
echo "$user->first_name $user->last_name";
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
);
} elseif ( $user->first_name ) {
echo $user->first_name;
} elseif ( $user->last_name ) {

7
src/wp-admin/includes/class-wp-users-list-table.php
View File

@ -568,7 +568,12 @@ class WP_Users_List_Table extends WP_List_Table {
break;
case 'name':
if ( $user_object->first_name && $user_object->last_name ) {
$r .= "$user_object->first_name $user_object->last_name";
$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
);
} elseif ( $user_object->first_name ) {
$r .= $user_object->first_name;
} elseif ( $user_object->last_name ) {

20
src/wp-includes/author-template.php
View File

@ -476,20 +476,12 @@ function wp_list_authors( $args = '' ) {
}
if ( $args['show_fullname'] && $author->first_name && $author->last_name ) {
$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 );
$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
);
} else {
$name = $author->display_name;
}

15
src/wp-includes/user.php
View File

@ -827,7 +827,12 @@ function wp_list_users( $args = array() ) {
}
if ( $args['show_fullname'] && '' !== $user->first_name && '' !== $user->last_name ) {
$name = "$user->first_name $user->last_name";
$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
);
} else {
$name = $user->display_name;
}
@ -2242,8 +2247,12 @@ function wp_insert_user( $userdata ) {
if ( $update ) {
$display_name = $user_login;
} elseif ( $meta['first_name'] && $meta['last_name'] ) {
/* 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'] );
$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']
);
} elseif ( $meta['first_name'] ) {
$display_name = $meta['first_name'];
} elseif ( $meta['last_name'] ) {