Changeset 23743

Timestamp:

03/18/2013 05:58:30 PM (12 years ago)

Author:

ryan

Message:

Fix i18n for revision diff strings displaying human time.

Props johnbillion
fixes #23723

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/post-template.php (modified) (2 diffs)

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

@@ -2135 +2135 @@
 
             $revision_from_date_author = sprintf(
-                '%s %s, %s %s (%s)',
+                /* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
+                _x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
                 $compare_to_gravatar,
                 $compare_to_author,
                 human_time_diff( strtotime( $left_revision->post_modified ), current_time( 'timestamp' ) ),
-                __( ' ago ' ),
                 $compare_to_date
             );
@@ -2206 +2206 @@
         $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
         $revision_date_author = sprintf(
-            '%s %s, %s %s (%s)',
+            /* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
+            _x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
             $gravatar,
             $author,
             human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
-            __( ' ago ' ),
             $date
         );

trunk/wp-includes/post-template.php

@@ -1318 +1318 @@
 
     $revision_date_author = sprintf(
-        '%s %s, %s %s (%s)',
+        /* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
+        _x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
         $gravatar,
         $author,
         human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
-        __( 'ago' ),
         $date
     );
@@ -1485 +1485 @@
             $datef = _x( 'j F, Y @ G:i:s', 'revision date format'); 
             $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) ); 
-            $timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) ) . __( ' ago ' ); 
+            $timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) ); 
             ?> 
             <hr />
             <div id="revisions-meta-restored"> 
                 <?php 
-                printf( 'Previously restored from Revision ID %d, %s by %s (%s)', 
+                /* translators: restored revision details: 1: revision ID, 2: time ago, 3: author name, 4: date */
+                printf( _x( 'Previously restored from revision ID %1$d, %2$s ago by %3$s (%4$s)', 'restored revision details' ), 
                 $restored_from_meta[ 'restored_revision_id'], 
                 $timesince,