diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 2f58d33864..59131cd06e 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -3694,8 +3694,6 @@ table.diff .diff-addedline ins { .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; } diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 8974ebf7a2..677b42808f 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -2245,7 +2245,9 @@ function wp_ajax_revisions_data() { $date ); + /* 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' ); if ( ! $post = get_post( $post_id ) ) diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js index be5ff87140..6f335cd01d 100644 --- a/wp-admin/js/revisions.js +++ b/wp-admin/js/revisions.js @@ -1,7 +1,7 @@ window.wp = window.wp || {}; (function($) { - var Revision, Revisions, Diff, l10n, revisions; + var Revision, Revisions, Diff, revisions; revisions = wp.revisions = function() { Diff = revisions.Diff = new Diff(); @@ -9,12 +9,8 @@ window.wp = window.wp || {}; _.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; /** @@ -330,12 +326,6 @@ window.wp = window.wp || {}; Diff.rightDiff = ui.values[1]; } - if ( 0 === Diff.leftDiff ) { - $( '#revision-diff-container' ).addClass( 'current-version' ); - } else { - $( '#revision-diff-container' ).removeClass( 'current-version' ); - } - Diff.revisionView.render(); } }, diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 33dd7a6b79..5ba5ddf56b 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -78,10 +78,6 @@ else wp_enqueue_script( 'revisions' ); -$strings = array( - 'diffFromTitle' => _x( 'From: %s', 'revision from title' ), - 'diffToTitle' => _x( 'To: %s', 'revision to title' ) -); $settings = array( 'post_id' => $post->ID, @@ -89,8 +85,7 @@ $settings = array( 'revision_id' => $revision_id ); -$strings['settings'] = $settings; -wp_localize_script( 'revisions', 'wpRevisionsL10n', $strings ); +wp_localize_script( 'revisions', 'wpRevisionsSettings', $settings ); require_once( './admin-header.php' ); @@ -125,18 +120,14 @@ require_once( './admin-header.php' );