Ticket #29849: 29849-codebase-replacements.diff

src/wp-admin/includes/class-wp-media-list-table.php

@@ -402 +402 @@
                         $m_time = $post->post_date;
                         $time = get_post_time( 'G', true, $post, false );
                         if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
-                                if ( $t_diff < 0 ) {
-                                        $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
-                                } else {
-                                        $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
-                                }
+                                $h_time = wp_natural_time( $time );
                         } else {
                                 $h_time = mysql2date( __( 'Y/m/d' ), $m_time );
                         }

src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -514 +514 @@
                                 </div>
                                 <div class="column-updated">
                                         <strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
-                                                <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+                                                <?php echo wp_natural_time( $last_updated_timestamp ); ?>
                                         </span>
                                 </div>
                                 <div class="column-downloaded">

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -792 +792 @@
                         $time_diff = time() - $time;
 
                         if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-                                $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+                                $h_time = wp_natural_time( $time );
                         } else {
                                 $h_time = mysql2date( __( 'Y/m/d' ), $m_time );
                         }

src/wp-admin/includes/plugin-install.php

@@ -463 +463 @@
                         <li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
                 <?php } if ( ! empty( $api->last_updated ) ) { ?>
                         <li><strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
-                                <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+                                <?php echo wp_natural_time( $last_updated_timestamp ); ?>
                         </span></li>
                 <?php } if ( ! empty( $api->requires ) ) { ?>
                         <li><strong><?php _e( 'Requires WordPress Version:' ); ?></strong> <?php printf( __( '%s or higher' ), $api->requires ); ?></li>

src/wp-admin/includes/revision.php

@@ -205 +205 @@
                         'author'     => $authors[ $revision->post_author ],
                         'date'       => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
                         'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
-                        'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
+                        'timeAgo'    => wp_natural_time( $modified_gmt, $now_gmt ),
                         'autosave'   => $autosave,
                         'current'    => $current,
                         'restoreUrl' => $can_restore ? $restore_link : false,
@@ -223 +223 @@
                         'author'     => $authors[ $post->post_author ],
                         'date'       => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ),
                         'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
-                        'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
+                        'timeAgo'    => wp_natural_time( $post->post_modified_gmt, $now_gmt ),
                         'autosave'   => false,
                         'current'    => true,
                         'restoreUrl' => false,
@@ -375 +375 @@
                 <# }); #>
                 </div>
         </script><?php
-}
- No newline at end of file
+}

src/wp-includes/post-template.php

@@ -1803 +1803 @@
                 _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' ) ),
+                wp_natural_time( $revision->post_modified, current_time( 'timestamp' ) ),
                 $date
         );