Skip to content

Commit

Permalink
Text Changes: Tweak the wording of email notification subjects.
Browse files Browse the repository at this point in the history
This change brings more coherence between the subject lines of the various emails WordPress will send.

Props ramiy, pento.
Fixes #37940.


git-svn-id: https://develop.svn.wordpress.org/trunk@45137 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
pento committed Apr 8, 2019
1 parent 95948ee commit f1bef86
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
8 changes: 4 additions & 4 deletions src/wp-admin/includes/class-wp-automatic-updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -904,11 +904,11 @@ protected function send_debug_email() {
);
$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(
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/user-new.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
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();
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -6582,7 +6582,7 @@ function wp_site_admin_email_change_notification( $old_email, $new_email, $optio
$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' => '',
);
Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/ms-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@ function update_network_option_new_admin_email( $old_value, $value ) {
$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();
Expand Down Expand Up @@ -2704,7 +2704,7 @@ function wp_network_admin_email_change_notification( $option_name, $new_email, $
$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' => '',
);
Expand Down
6 changes: 3 additions & 3 deletions src/wp-includes/pluggable.php
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,7 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )

$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' => '',
Expand Down Expand Up @@ -1984,8 +1984,8 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )

$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' => '',
);
Expand Down
13 changes: 7 additions & 6 deletions src/wp-includes/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -1970,8 +1970,8 @@ function wp_update_user( $userdata ) {

$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' => '',
);
Expand Down Expand Up @@ -2027,8 +2027,8 @@ function wp_update_user( $userdata ) {

$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' => '',
);
Expand Down Expand Up @@ -2809,7 +2809,8 @@ function send_confirmation_on_profile_email() {
$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;
}
Expand Down Expand Up @@ -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']
);
Expand Down

0 comments on commit f1bef86

Please sign in to comment.