WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@48049


git-svn-id: http://core.svn.wordpress.org/trunk@47816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-15 19:41:11 +00:00
parent 4cdd79af25
commit 6aa5788189
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/ms-delete-site.php
View File

@ -52,7 +52,7 @@ if ( isset( $_POST['action'] ) && 'deleteblog' === $_POST['action'] && isset( $_
$switched_locale = switch_to_locale( get_locale() ); $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 = __( $content = __(
"Howdy ###USERNAME###, "Howdy ###USERNAME###,
@ -68,8 +68,8 @@ some time in the future! (But remember your current site and username
are gone forever.) are gone forever.)
Thanks for using the site, Thanks for using the site,
Webmaster All at ###SITENAME###
###SITE_NAME###" ###SITEURL###"
); );
/** /**
* Filters the email content sent when a site in a Multisite network is deleted. * 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( '###USERNAME###', $user->user_login, $content );
$content = str_replace( '###URL_DELETE###', $url_delete, $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( wp_mail(
get_option( 'admin_email' ), get_option( 'admin_email' ),

2
wp-includes/user.php
View File

@ -2574,7 +2574,7 @@ function register_new_user( $user_login, $user_email ) {
'registerfail', 'registerfail',
sprintf( sprintf(
/* translators: %s: Admin email address. */ /* 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' ) get_option( 'admin_email' )
) )
); );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48048'; $wp_version = '5.5-alpha-48049';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.