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

Text Changes: Tweak the wording of email notification subjects. 

This change brings more coherence between the subject lines of the various emails WordPress will send.

Props ramiy, pento.
Fixes #37940.

Built from https://develop.svn.wordpress.org/trunk@45137


git-svn-id: http://core.svn.wordpress.org/trunk@44946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-04-08 06:17:51 +00:00
parent f6128eb7e6
commit 9a80e2095b
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/class-wp-automatic-updater.php
View File

@ -904,11 +904,11 @@ Thanks! -- The WordPress Team"
);
$body[] = '';
/* translators: %s: site title */
$subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
/* translators: Background update failed notification email subject. %s: site title */
$subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
} else {
/* translators: %s: site title */
$subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
/* translators: Background update finished notification email subject. %s: site title */
$subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
}
$body[] = trim(

2
wp-admin/user-new.php
View File

@ -122,7 +122,7 @@ You\'ve been invited to join \'%1$s\' at
Please click the following link to confirm the invite:
%4$s'
);
wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
wp_mail( $new_user_email, sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
if ( $switched_locale ) {
restore_previous_locale();

2
wp-includes/functions.php
View File

@ -6582,7 +6582,7 @@ All at ###SITENAME###
$email_change_email = array(
'to' => $old_email,
/* translators: Site admin email change notification email subject. %s: Site title */
'subject' => __( '[%s] Notice of Admin Email Change' ),
'subject' => __( '[%s] Admin Email Changed' ),
'message' => $email_change_text,
'headers' => '',
);

4
wp-includes/ms-functions.php
View File

@ -2645,7 +2645,7 @@ All at ###SITENAME###
$content = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
$content = str_replace( '###SITEURL###', network_home_url(), $content );
wp_mail( $value, sprintf( __( '[%s] New Network Admin Email Address' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
if ( $switched_locale ) {
restore_previous_locale();
@ -2704,7 +2704,7 @@ All at ###SITENAME###
$email_change_email = array(
'to' => $old_email,
/* translators: Network admin email change notification email subject. %s: Network title */
'subject' => __( '[%s] Notice of Network Admin Email Change' ),
'subject' => __( '[%s] Network Admin Email Changed' ),
'message' => $email_change_text,
'headers' => '',
);

6
wp-includes/pluggable.php
View File

@ -1918,7 +1918,7 @@ if ( ! function_exists( 'wp_new_user_notification' ) ) :
$wp_new_user_notification_email_admin = array(
'to' => get_option( 'admin_email' ),
/* translators: Password change notification email subject. %s: Site title */
/* translators: New user registration notification email subject. %s: Site title */
'subject' => __( '[%s] New User Registration' ),
'message' => $message,
'headers' => '',
@ -1984,8 +1984,8 @@ if ( ! function_exists( 'wp_new_user_notification' ) ) :
$wp_new_user_notification_email = array(
'to' => $user->user_email,
/* translators: Password change notification email subject. %s: Site title */
'subject' => __( '[%s] Your username and password info' ),
/* translators: Login credentials notification email subject. %s: Site title */
'subject' => __( '[%s] Login Credentials' ),
'message' => $message,
'headers' => '',
);

13
wp-includes/user.php
View File

@ -1970,8 +1970,8 @@ All at ###SITENAME###
$pass_change_email = array(
'to' => $user['user_email'],
/* translators: User password change notification email subject. %s: Site name */
'subject' => __( '[%s] Notice of Password Change' ),
/* translators: Password change notification email subject. %s: Site name */
'subject' => __( '[%s] Password Changed' ),
'message' => $pass_change_text,
'headers' => '',
);
@ -2027,8 +2027,8 @@ All at ###SITENAME###
$email_change_email = array(
'to' => $user['user_email'],
/* translators: User email change notification email subject. %s: Site name */
'subject' => __( '[%s] Notice of Email Change' ),
/* translators: Email change notification email subject. %s: Site name */
'subject' => __( '[%s] Email Changed' ),
'message' => $email_change_text,
'headers' => '',
);
@ -2809,7 +2809,8 @@ All at ###SITENAME###
$content = str_replace( '###SITENAME###', $sitename, $content );
$content = str_replace( '###SITEURL###', home_url(), $content );
wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), $sitename ), $content );
/* translators: New email address notification email subject. %s: Site name */
wp_mail( $_POST['email'], sprintf( __( '[%s] Email Change Request' ), $sitename ), $content );
$_POST['email'] = $current_user->user_email;
}
@ -3168,7 +3169,7 @@ function _wp_privacy_send_erasure_fulfillment_notification( $request_id ) {
);
$subject = sprintf(
/* translators: %s: Site name. */
/* translators: Erasure request fulfilled notification email subject. %s: Site name. */
__( '[%s] Erasure Request Fulfilled' ),
$email_data['sitename']
);

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.2-beta1-45136';
$wp_version = '5.2-beta1-45137';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.