Changeset 24157

Timestamp:

05/02/2013 10:12:19 AM (11 years ago)

Author:

ocean90

Message:

Revisions UI: Add translation contexts and remove unneeded lines.

props nao. fixes #23917.

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/js/revisions.js (modified) (3 diffs)
• wp-admin/revision.php (modified) (5 diffs)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.css

@@ -3695 +3695 @@
 .comparing-two-revisions #diff-previous-revision,
 .comparing-two-revisions #diff-next-revision,
-#diff-title-from-current-version,
-.comparing-two-revisions.current-version #diff-title-from-current-version,
 #diff-header-from {
     display: none;

trunk/wp-admin/includes/ajax-actions.php

@@ -2246 +2246 @@
         );
 
+        /* translators: 1: date */
         $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
+        /* translators: 1: date */
         $currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
 

trunk/wp-admin/js/revisions.js

@@ -2 +2 @@
 
 (function($) {
-    var Revision, Revisions, Diff, l10n, revisions;
+    var Revision, Revisions, Diff, revisions;
 
     revisions = wp.revisions = function() {
@@ -10 +10 @@
     _.extend( revisions, { model: {}, view: {}, controller: {} } );
 
-    // Link any localized strings.
-    l10n = revisions.model.l10n = typeof wpRevisionsL10n === 'undefined' ? {} : wpRevisionsL10n;
-
-    // Link any settings.
-    revisions.model.settings = l10n.settings || {};
-    delete l10n.settings;
+    // Link settings.
+    revisions.model.settings = typeof wpRevisionsSettings === 'undefined' ? {} : wpRevisionsSettings;
 
 
@@ -331 +327 @@
                 }
 
-                if ( 0 === Diff.leftDiff ) {
-                    $( '#revision-diff-container' ).addClass( 'current-version' );
-                } else {
-                    $( '#revision-diff-container' ).removeClass( 'current-version' );
-                }
-
                 Diff.revisionView.render();
             }

trunk/wp-admin/revision.php

@@ -79 +79 @@
 wp_enqueue_script( 'revisions' );
 
-$strings = array(
-    'diffFromTitle' => _x( 'From: %s', 'revision from title'  ),
-    'diffToTitle'   => _x( 'To: %s', 'revision to title' )
-);
 
 $settings = array(
@@ -90 +86 @@
 );
 
-$strings['settings'] = $settings;
-wp_localize_script( 'revisions', 'wpRevisionsL10n', $strings );
+wp_localize_script( 'revisions', 'wpRevisionsSettings', $settings );
 
 require_once( './admin-header.php' );
@@ -126 +121 @@
     <div id="diff-header">
         <div id="diff-header-from" class="diff-header">
-            <div id="diff-title-from-current-version" class="diff-title">
-                <?php printf( '<strong>%1$s</strong> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?>
-            </div>
-
             <div id="diff-title-from" class="diff-title">
-                <strong><?php _e( 'From:' ); ?></strong> {{{ data.titleFrom }}}
+                <strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong> {{{ data.titleFrom }}}
             </div>
         </div>
@@ -137 +128 @@
         <div id="diff-header-to" class="diff-header">
             <div id="diff-title-to" class="diff-title">
-                <strong><?php _e( 'To:' ); ?></strong> {{{ data.titleTo }}}
+                <strong><?php _e( 'To:', 'Followed by post revision info' ); ?></strong> {{{ data.titleTo }}}
             </div>
 
@@ -151 +142 @@
 <script id="tmpl-revision-interact" type="text/html">
     <div id="diff-previous-revision">
-        <input class="button" type="button" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" />
+        <input class="button" type="button" id="previous" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
     </div>
 
     <div id="diff-next-revision">
-        <input class="button" type="button" id="next" value="<?php esc_attr_e( 'Next' ); ?>" />
+        <input class="button" type="button" id="next" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
     </div>
 

trunk/wp-includes/post-template.php

@@ -1313 +1313 @@
     $datef = _x( 'j F, Y @ G:i', 'revision date format');
     /* translators: 1: date */
-    $autosavef = __( '%1$s [Autosave]' );
+    $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
     /* translators: 1: date */
-    $currentf  = __( '%1$s [Current Revision]' );
+    $currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
 
     $date = date_i18n( $datef, strtotime( $revision->post_modified ) );