From 00c0913c1f6033aa0bca63a44611cbe6097e2e98 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 15 Jun 2020 19:39:32 +0000
Subject: [PATCH] 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@48049 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/ms-delete-site.php | 9 +++++----
 src/wp-includes/user.php        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/wp-admin/ms-delete-site.php b/src/wp-admin/ms-delete-site.php
index 817ff93560..baad601a11 100644
--- a/src/wp-admin/ms-delete-site.php
+++ b/src/wp-admin/ms-delete-site.php
@@ -52,7 +52,7 @@ if ( isset( $_POST['action'] ) && 'deleteblog' === $_POST['action'] && isset( $_
 
 	$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###,
 
@@ -68,8 +68,8 @@ some time in the future! (But remember your current site and username
 are gone forever.)
 
 Thanks for using the site,
-Webmaster
-###SITE_NAME###"
+All at ###SITENAME###
+###SITEURL###"
 	);
 	/**
 	 * Filters the email content sent when a site in a Multisite network is deleted.
@@ -82,7 +82,8 @@ Webmaster
 
 	$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(
 		get_option( 'admin_email' ),
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index a1e88f2e5a..e0645493a2 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -2574,7 +2574,7 @@ function register_new_user( $user_login, $user_email ) {
 			'registerfail',
 			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' )
 			)
 		);