<!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>[43598] trunk/src/wp-admin/includes: I18n: Improve translators comments [3].</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/43598">43598</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/43598","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jrf</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-08-30 13:35:27 +0000 (Thu, 30 Aug 2018)</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'>I18n: Improve translators comments <a href="https://core.trac.wordpress.org/changeset/3">[3]</a>.
* Add missing translators comments.
* Fix placement of some translators comments.
Translators comments should be on the line directly above the line containing the translation function call for optimal compatibility with various `.pot` file generation tools.
The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translators comments.
Includes minor code layout fixes.
Patch `44360-wp-admin-includes-dir.patch` of the series.
Props flipkeijzer, alvarogois, michielatyoast
See <a href="https://core.trac.wordpress.org/ticket/44360">#44360</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkpluginupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkthemeupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderskinphp">trunk/src/wp-admin/includes/class-language-pack-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassplugininstallerskinphp">trunk/src/wp-admin/includes/class-plugin-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeinstallerskinphp">trunk/src/wp-admin/includes/class-theme-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderskinphp">trunk/src/wp-admin/includes/class-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,10 +390,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_comments_text' => sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments approved */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment', '%s Comments', $counts->approved ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->approved )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments in moderation */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,6 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supplemental' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $comment ? $comment->comment_approved : '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'postId' => $comment ? $comment->comment_post_ID : '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_pages' => ceil( $total / $per_page ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,6 +838,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: comment ID */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => new WP_Error( 'invalid_comment', sprintf( __( 'Comment %d does not exist' ), $id ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1214,10 +1218,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response['supplemental'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_comments_text' => sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments approved */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment', '%s Comments', $counts->approved ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->approved )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments moderated */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1813,7 +1819,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last = wp_check_post_lock( $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ), esc_html( $last_user_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* translators: %s: user who is currently editing the post */
+ $msg_template = __( 'Saving is disabled: %s is currently editing this post.' );
+ if ( $_POST['post_type'] == 'page' ) {
+ /* translators: %s: user who is currently editing the page */
+ $msg_template = __( 'Saving is disabled: %s is currently editing this page.' );
+ }
+
+ printf( $msg_template, esc_html( $last_user_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2508,9 +2522,11 @@
</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"> if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $last_user = get_userdata( $last_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_user = get_userdata( $last_id );
+ /* translators: 1: display_name of last user, 2: date of last edit, 3: time of last edit. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_edited = sprintf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), $last_date, $last_time );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: date of last edit, 2: time of last edit. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_edited = sprintf( __( 'Last edited on %1$s at %2$s' ), $last_date, $last_time );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3336,6 +3352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'not-embeddable',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL which cannot be embedded, between code tags */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => sprintf( __( '%s failed to embed.' ), '<code>' . esc_html( $url ) . '</code>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/bookmark.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = network_admin_url( 'plugin-install.php?tab=search&s=Link+Manager' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL of link manager plugin */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkpluginupgraderskinphp"></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-bulk-plugin-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: name of plugin being updated, 2: number of updating plugin, 3: total number of plugins being updated */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkthemeupgraderskinphp"></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-bulk-theme-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: name of theme being updated, 2: number of updating themes, 3: total number of themes being updated */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Theme %1$s (%2$d/%3$d)' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasslanguagepackupgraderskinphp"></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-language-pack-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="update-messages lp-show-latest">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: name of project, 2: language */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<h2>' . __( 'Updating translations for %1$s (%2$s)…' ) . '</h2>', $name, $this->language_update->language );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasslanguagepackupgraderphp"></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-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,8 +343,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incompatible_archive_pomo',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['incompatible_archive'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: .po, 2: .mo */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: .po, 2: .mo */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The language pack is missing either the %1$s or %2$s files.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.po</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.mo</code>'
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassplugininstallerskinphp"></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-plugin-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function before() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->api ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: name of API, 2: version of API */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['process_success'] = sprintf( __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' ), $this->api->name, $this->api->version );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeinstallerskinphp"></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-theme-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-installer-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $customize_url = add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $customize_url = add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => urlencode( $stylesheet ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,9 +82,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'customize.php' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
+ $install_actions['preview'] .= '<span aria-hidden="true">' . __( 'Live Preview' ) . '</span>';
+ /* translators: %s: theme name */
+ $install_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink">';
+ $install_actions['activate'] .= '<span aria-hidden="true">' . __( 'Activate' ) . '</span>';
+ /* translators: %s: theme name */
+ $install_actions['activate'] .= '<span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderskinphp"></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-theme-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,13 +65,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_stylesheet() == $stylesheet ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
+ $update_actions['preview'] .= '<span aria-hidden="true">' . __( 'Customize' ) . '</span>';
+ /* translators: %s: theme name */
+ $update_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Customize “%s”' ), $name ) . '</span></a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'switch_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
+ $update_actions['preview'] .= '<span aria-hidden="true">' . __( 'Live Preview' ) . '</span>';
+ /* translators: %s: theme name */
+ $update_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink">';
+ $update_actions['activate'] .= '<span aria-hidden="true">' . __( 'Activate' ) . '</span>';
+ /* translators: %s: theme name */
+ $update_actions['activate'] .= '<span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</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"> if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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-theme-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,8 +473,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incompatible_archive_theme_no_style',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['incompatible_archive'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: style.css */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: style.css */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The theme is missing the %s stylesheet.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,8 +493,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incompatible_archive_theme_no_name',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['incompatible_archive'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: style.css */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: style.css */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The %s stylesheet doesn’t contain a valid theme header.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,8 +506,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incompatible_archive_theme_no_index',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['incompatible_archive'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: index.php */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: index.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The theme is missing the %s file.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>index.php</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenuchecklistphp"></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-walker-nav-menu-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,6 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = apply_filters( 'the_title', $item->post_title, $item->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: front page title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></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-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-actions description-wide submitbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="link-to-original">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: original title */
+ printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="
</span></span></pre></div>
<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 2018-08-30 12:39:07 UTC (rev 43597)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2018-08-30 13:35:27 UTC (rev 43598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader_item = $item;
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'core':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_name = sprintf( __( 'WordPress %s' ), $item->version );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'theme':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,6 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader_item = $item->theme;
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( $upgrader_item );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_name = $theme->Get( 'Name' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Theme name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $skin->feedback( __( 'Updating theme: %s' ), $item_name );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'plugin':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,11 +323,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader_item = $item->plugin;
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data = get_plugin_data( $context . '/' . $upgrader_item );
</span><span class="cx" style="display: block; padding: 0 10px"> $item_name = $plugin_data['Name'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'translation':
</span><span class="cx" style="display: block; padding: 0 10px"> $language_item_name = $upgrader->get_name_for_update( $item );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Name of language item */
+ $item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
+ /* translators: 1: Name of language item, 2: Language */
</ins><span class="cx" style="display: block; padding: 0 10px"> $skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)…' ), $language_item_name, $item->language ) );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,6 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'success':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Home URL, 2: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $newer_version_available ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,10 +677,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Can only reference the About screen if their update was successful.
</span><span class="cx" style="display: block; padding: 0 10px"> list( $about_version ) = explode( '-', $core_update->current, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
- $body .= "\n" . admin_url( 'about.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress core version */
+ $body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
+ $body .= "\n" . admin_url( 'about.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newer_version_available ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress core latest version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'Updating is easy and only takes a few moments:' );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . network_admin_url( 'update-core.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,6 +692,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'fail':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'manual':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Home URL, 2: WordPress core latest version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,8 +709,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'critical':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newer_version_available ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Home URL, 2: WordPress core latest version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Home URL, 2: Core update version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,6 +726,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $critical_support = 'critical' === $type && ! empty( $core_update->support_email );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $critical_support ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Support offer if available.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Support e-mail */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . sprintf( __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ), $core_update->support_email );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a note about the support forums.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,6 +753,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'critical' == $type && is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n***\n\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,7 +771,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $error_code = $error->get_error_code();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Error code */
+ $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'rollback_was_required' == $error_code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,6 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $failures = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Network home URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Core
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,8 +837,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->update_results['core'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->update_results['core'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $result->result && ! is_wp_error( $result->result ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress core version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress core version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
</span><span class="cx" style="display: block; padding: 0 10px"> $failures++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,6 +862,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = $messages[ $type ];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: name of plugin / theme / translations */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,6 +877,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = $messages[ $type ];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->update_results[ $type ] as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $item->result || is_wp_error( $item->result ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: name of plugin / theme / translations */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
</span><span class="cx" style="display: block; padding: 0 10px"> $failures++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,8 +904,10 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>