Changeset 48049

Timestamp:

06/15/2020 07:39:32 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Text Changes: Replace "Webmaster" in output messages with more appropriate terms:

• "All at ###SITENAME###" in wp-admin/ms-delete-site.php, for consistency with other Multisite emails.
• "Site admin" in register_new_user(), for clarity.

Props Presskopp, marybaum.
Fixes #50394.

Location:

trunk/src

Files:

• wp-admin/ms-delete-site.php (modified) (3 diffs)
• wp-includes/user.php (modified) (1 diff)

trunk/src/wp-admin/ms-delete-site.php

@@ -53 +53 @@
     $switched_locale = switch_to_locale( get_locale() );
 
-    /* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
+    /* translators: Do not translate USERNAME, URL_DELETE, SITENAME, SITEURL: those are placeholders. */
     $content = __(
         "Howdy ###USERNAME###,
@@ -69 +69 @@
 
 Thanks for using the site,
-Webmaster
-###SITE_NAME###"
+All at ###SITENAME###
+###SITEURL###"
     );
     /**
@@ -83 +83 @@
     $content = str_replace( '###USERNAME###', $user->user_login, $content );
     $content = str_replace( '###URL_DELETE###', $url_delete, $content );
-    $content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
+    $content = str_replace( '###SITENAME###', get_network()->site_name, $content );
+    $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
     wp_mail(

trunk/src/wp-includes/user.php

@@ -2575 +2575 @@
             sprintf(
                 /* translators: %s: Admin email address. */
-                __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ),
+                __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">site admin</a>!' ),
                 get_option( 'admin_email' )
             )