<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45137] trunk/src: Text Changes: Tweak the wording of email notification subjects.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45137">45137</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45137","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-08 06:16:41 +0000 (Mon, 08 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/37940">#37940</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,11 +904,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site title */
- $subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Background update failed notification email subject. %s: site title */
+ $subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site title */
- $subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Background update finished notification email subject. %s: site title */
+ $subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = trim(
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-admin/user-new.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Please click the following link to confirm the invite:
</span><span class="cx" style="display: block; padding: 0 10px"> %4$s'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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/" ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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/" ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-includes/functions.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6582,7 +6582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $old_email,
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Site admin email change notification email subject. %s: Site title */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subject' => __( '[%s] Notice of Admin Email Change' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subject' => __( '[%s] Admin Email Changed' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => $email_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-includes/ms-functions.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2645,7 +2645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_mail( $value, sprintf( __( '[%s] New Network Admin Email Address' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2704,7 +2704,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $old_email,
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Network admin email change notification email subject. %s: Network title */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subject' => __( '[%s] Notice of Network Admin Email Change' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subject' => __( '[%s] Network Admin Email Changed' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => $email_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-includes/pluggable.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1918,7 +1918,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_new_user_notification_email_admin = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => get_option( 'admin_email' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Password change notification email subject. %s: Site title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user registration notification email subject. %s: Site title */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subject' => __( '[%s] New User Registration' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $message,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1984,8 +1984,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_new_user_notification_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $user->user_email,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Password change notification email subject. %s: Site title */
- 'subject' => __( '[%s] Your username and password info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Login credentials notification email subject. %s: Site title */
+ 'subject' => __( '[%s] Login Credentials' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => $message,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2019-04-08 06:03:58 UTC (rev 45136)
+++ trunk/src/wp-includes/user.php 2019-04-08 06:16:41 UTC (rev 45137)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1970,8 +1970,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pass_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $user['user_email'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: User password change notification email subject. %s: Site name */
- 'subject' => __( '[%s] Notice of Password Change' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Password change notification email subject. %s: Site name */
+ 'subject' => __( '[%s] Password Changed' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => $pass_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2027,8 +2027,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $user['user_email'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: User email change notification email subject. %s: Site name */
- 'subject' => __( '[%s] Notice of Email Change' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Email change notification email subject. %s: Site name */
+ 'subject' => __( '[%s] Email Changed' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => $email_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2809,7 +2809,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', $sitename, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', home_url(), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), $sitename ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New email address notification email subject. %s: Site name */
+ wp_mail( $_POST['email'], sprintf( __( '[%s] Email Change Request' ), $sitename ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = $current_user->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3168,7 +3169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Site name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Erasure request fulfilled notification email subject. %s: Site name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '[%s] Erasure Request Fulfilled' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $email_data['sitename']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>