Changeset 53501

Timestamp:

06/14/2022 02:41:10 PM (2 years ago)

Author:

SergeyBiryukov

Message:

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()​
• 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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-users-list-table.php (modified) (1 diff)
• wp-includes/author-template.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -303 +303 @@
     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;

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -569 +569 @@
                     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;

trunk/src/wp-includes/author-template.php

@@ -477 +477 @@
 
         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;

trunk/src/wp-includes/user.php

@@ -828 +828 @@
 
         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;
@@ -2243 +2248 @@
             $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'];