<!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>[24157] trunk: Revisions UI: Add translation contexts and remove unneeded lines.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24157">24157</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-05-02 10:12:19 +0000 (Thu, 02 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions UI: Add translation contexts and remove unneeded lines.
props nao. fixes <a href="http://core.trac.wordpress.org/ticket/23917">#23917</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
<li><a href="#trunkwpadminrevisionphp">trunk/wp-admin/revision.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24156 => 24157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-05-02 09:35:35 UTC (rev 24156)
+++ trunk/wp-admin/css/wp-admin.css 2013-05-02 10:12:19 UTC (rev 24157)
</span><span class="lines">@@ -3694,8 +3694,6 @@
</span><span class="cx">
</span><span class="cx"> .comparing-two-revisions #diff-previous-revision,
</span><span class="cx"> .comparing-two-revisions #diff-next-revision,
</span><del>-#diff-title-from-current-version,
-.comparing-two-revisions.current-version #diff-title-from-current-version,
</del><span class="cx"> #diff-header-from {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (24156 => 24157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-05-02 09:35:35 UTC (rev 24156)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-05-02 10:12:19 UTC (rev 24157)
</span><span class="lines">@@ -2245,7 +2245,9 @@
</span><span class="cx"> $date
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ /* translators: 1: date */
</ins><span class="cx"> $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
</span><ins>+ /* translators: 1: date */
</ins><span class="cx"> $currentf = _x( '%1$s [Current Revision]', 'post revision title extra' );
</span><span class="cx">
</span><span class="cx"> if ( ! $post = get_post( $post_id ) )
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (24156 => 24157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-05-02 09:35:35 UTC (rev 24156)
+++ trunk/wp-admin/js/revisions.js 2013-05-02 10:12:19 UTC (rev 24157)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> window.wp = window.wp || {};
</span><span class="cx">
</span><span class="cx"> (function($) {
</span><del>- var Revision, Revisions, Diff, l10n, revisions;
</del><ins>+ var Revision, Revisions, Diff, revisions;
</ins><span class="cx">
</span><span class="cx"> revisions = wp.revisions = function() {
</span><span class="cx"> Diff = revisions.Diff = new Diff();
</span><span class="lines">@@ -9,14 +9,10 @@
</span><span class="cx">
</span><span class="cx"> _.extend( revisions, { model: {}, view: {}, controller: {} } );
</span><span class="cx">
</span><del>- // Link any localized strings.
- l10n = revisions.model.l10n = typeof wpRevisionsL10n === 'undefined' ? {} : wpRevisionsL10n;
</del><ins>+ // Link settings.
+ revisions.model.settings = typeof wpRevisionsSettings === 'undefined' ? {} : wpRevisionsSettings;
</ins><span class="cx">
</span><del>- // Link any settings.
- revisions.model.settings = l10n.settings || {};
- delete l10n.settings;
</del><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * ========================================================================
</span><span class="cx"> * CONTROLLERS
</span><span class="lines">@@ -330,12 +326,6 @@
</span><span class="cx"> Diff.rightDiff = ui.values[1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 0 === Diff.leftDiff ) {
- $( '#revision-diff-container' ).addClass( 'current-version' );
- } else {
- $( '#revision-diff-container' ).removeClass( 'current-version' );
- }
-
</del><span class="cx"> Diff.revisionView.render();
</span><span class="cx"> }
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/revision.php (24156 => 24157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/revision.php 2013-05-02 09:35:35 UTC (rev 24156)
+++ trunk/wp-admin/revision.php 2013-05-02 10:12:19 UTC (rev 24157)
</span><span class="lines">@@ -78,10 +78,6 @@
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'revisions' );
</span><span class="cx">
</span><del>-$strings = array(
- 'diffFromTitle' => _x( 'From: %s', 'revision from title' ),
- 'diffToTitle' => _x( 'To: %s', 'revision to title' )
-);
</del><span class="cx">
</span><span class="cx"> $settings = array(
</span><span class="cx"> 'post_id' => $post->ID,
</span><span class="lines">@@ -89,8 +85,7 @@
</span><span class="cx"> 'revision_id' => $revision_id
</span><span class="cx"> );
</span><span class="cx">
</span><del>-$strings['settings'] = $settings;
-wp_localize_script( 'revisions', 'wpRevisionsL10n', $strings );
</del><ins>+wp_localize_script( 'revisions', 'wpRevisionsSettings', $settings );
</ins><span class="cx">
</span><span class="cx"> require_once( './admin-header.php' );
</span><span class="cx">
</span><span class="lines">@@ -125,18 +120,14 @@
</span><span class="cx">
</span><span class="cx"> <div id="diff-header">
</span><span class="cx"> <div id="diff-header-from" class="diff-header">
</span><del>- <div id="diff-title-from-current-version" class="diff-title">
- <?php printf( '<strong>%1$s</strong> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?>
- </div>
-
</del><span class="cx"> <div id="diff-title-from" class="diff-title">
</span><del>- <strong><?php _e( 'From:' ); ?></strong> {{{ data.titleFrom }}}
</del><ins>+ <strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong> {{{ data.titleFrom }}}
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="diff-header-to" class="diff-header">
</span><span class="cx"> <div id="diff-title-to" class="diff-title">
</span><del>- <strong><?php _e( 'To:' ); ?></strong> {{{ data.titleTo }}}
</del><ins>+ <strong><?php _e( 'To:', 'Followed by post revision info' ); ?></strong> {{{ data.titleTo }}}
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <input type="button" id="restore-revision" class="button button-primary" data-restore-link="{{{ data.restoreLink }}}" value="<?php esc_attr_e( 'Restore This Revision' )?>" />
</span><span class="lines">@@ -150,11 +141,11 @@
</span><span class="cx">
</span><span class="cx"> <script id="tmpl-revision-interact" type="text/html">
</span><span class="cx"> <div id="diff-previous-revision">
</span><del>- <input class="button" type="button" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" />
</del><ins>+ <input class="button" type="button" id="previous" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="diff-next-revision">
</span><del>- <input class="button" type="button" id="next" value="<?php esc_attr_e( 'Next' ); ?>" />
</del><ins>+ <input class="button" type="button" id="next" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="diff-slider" class="wp-slider"></div>
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (24156 => 24157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-05-02 09:35:35 UTC (rev 24156)
+++ trunk/wp-includes/post-template.php 2013-05-02 10:12:19 UTC (rev 24157)
</span><span class="lines">@@ -1312,9 +1312,9 @@
</span><span class="cx"> /* translators: revision date format, see http://php.net/date */
</span><span class="cx"> $datef = _x( 'j F, Y @ G:i', 'revision date format');
</span><span class="cx"> /* translators: 1: date */
</span><del>- $autosavef = __( '%1$s [Autosave]' );
</del><ins>+ $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
</ins><span class="cx"> /* translators: 1: date */
</span><del>- $currentf = __( '%1$s [Current Revision]' );
</del><ins>+ $currentf = _x( '%1$s [Current Revision]', 'post revision title extra' );
</ins><span class="cx">
</span><span class="cx"> $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
</span><span class="cx"> if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
</span></span></pre>
</div>
</div>
</body>
</html>