Changeset 45542

Timestamp:

06/15/2019 06:56:47 PM (7 years ago)

Author:

SergeyBiryukov

Message:

I18N: Merge duplicate strings in notifications displayed when a new user has been created or added to the site.

Props ramiy.
Fixes #35746.

Location:

trunk/src/wp-admin

Files:

• network/user-new.php (modified) (1 diff)
• user-new.php (modified) (1 diff)
• users.php (modified) (2 diffs)

trunk/src/wp-admin/network/user-new.php

@@ -87 +87 @@
         }
 
-        if ( empty( $edit_link ) ) {
-            $messages[] = __( 'User added.' );
-        } else {
-            /* translators: %s: edit page url */
-            $messages[] = sprintf( __( 'User added. <a href="%s">Edit user</a>' ), $edit_link );
+        $message = __( 'User added.' );
+
+        if ( $edit_link ) {
+            $message .= sprintf(
+                ' <a href="%s">%s</a>',
+                $edit_link,
+                __( 'Edit user' )
+            );
         }
+
+        $messages[] = $message;
     }
 }

trunk/src/wp-admin/user-new.php

@@ -294 +294 @@
                 break;
             case 'addnoconfirmation':
-                if ( empty( $edit_link ) ) {
-                    $messages[] = __( 'User has been added to your site.' );
-                } else {
-                    /* translators: %s: edit page url */
-                    $messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit user</a>' ), $edit_link );
+                $message = __( 'User has been added to your site.' );
+
+                if ( $edit_link ) {
+                    $message .= sprintf(
+                        ' <a href="%s">%s</a>',
+                        $edit_link,
+                        __( 'Edit user' )
+                    );
                 }
+
+                $messages[] = $message;
                 break;
             case 'addexisting':

trunk/src/wp-admin/users.php

@@ -484 +484 @@
                     break;
                 case 'add':
+                    $message = __( 'New user created.' );
+
                     if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
-                        /* translators: %s: edit page url */
-                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf(
-                            __( 'New user created. <a href="%s">Edit user</a>' ),
+                        $message .= sprintf(
+                            ' <a href="%s">%s</a>',
                             esc_url(
                                 add_query_arg(
@@ -494 +495 @@
                                     self_admin_url( 'user-edit.php?user_id=' . $user_id )
                                 )
-                            )
-                        ) . '</p></div>';
-                    } else {
-                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
+                            ),
+                            __( 'Edit user' )
+                        );
                     }
+
+                    $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . $message . '</p></div>';
                     break;
                 case 'promote':