Changeset 35811

Timestamp:

12/07/2015 04:25:53 AM (9 years ago)

Author:

iseulde

Message:

Make date format consistent across the admin

The 'date_format' and 'time_format' options shouldn't affect the backend.

See #30864

Location:

trunk/src

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/comment.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/options-general.php (modified) (2 diffs)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/admin.php

@@ -90 +90 @@
 set_screen_options();
 
-$date_format = get_option('date_format');
-$time_format = get_option('time_format');
+$date_format = __( 'F j, Y' );
+$time_format = __( 'g:i a' );
 
 wp_enqueue_script( 'common' );

trunk/src/wp-admin/comment.php

@@ -200 +200 @@
                 /* translators: comment date format. See http://php.net/date */
                 get_comment_date( __( 'Y/m/d' ), $comment ),
-                get_comment_date( get_option( 'time_format' ), $comment )
+                get_comment_date( __( 'g:i a' ), $comment )
             );
         ?></a>

trunk/src/wp-admin/edit-form-advanced.php

@@ -632 +632 @@
         echo '<span id="last-edit">';
         if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
-            printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+            printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
         } else {
-            printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+            printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
         }
         echo '</span>';

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

@@ -1238 +1238 @@
             $post_data['post_status'] = 'draft';
             $now = current_time('timestamp', 1);
-            $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( get_option( 'date_format' ), $now ), date( get_option( 'time_format' ), $now ) );
+            $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) );
 
             $pid = edit_post( $post_data );
@@ -2228 +2228 @@
 
     if ( $post ) {
-        $last_date = mysql2date( get_option('date_format'), $post->post_modified );
-        $last_time = mysql2date( get_option('time_format'), $post->post_modified );
+        $last_date = mysql2date( __( 'F j, Y' ), $post->post_modified );
+        $last_time = mysql2date( __( 'g:i a' ), $post->post_modified );
     } else {
-        $last_date = date_i18n( get_option('date_format') );
-        $last_time = date_i18n( get_option('time_format') );
+        $last_date = date_i18n( __( 'F j, Y' ) );
+        $last_time = date_i18n( __( 'g:i a' ) );
     }
 

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -721 +721 @@
             /* translators: comment date format. See http://php.net/date */
             get_comment_date( __( 'Y/m/d' ), $comment ),
-            get_comment_date( get_option( 'time_format' ), $comment )
+            get_comment_date( __( 'g:i a' ), $comment )
         );
         echo '</a>';

trunk/src/wp-admin/includes/dashboard.php

@@ -551 +551 @@
         echo "<li>\n";
         echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
-        echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
+        echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
         if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
             echo '<p>' . $the_content . '</p>';

trunk/src/wp-admin/includes/media.php

@@ -1456 +1456 @@
             <p><strong>" . __('File name:') . "</strong> $filename</p>
             <p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
-            <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
+            <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
             if ( !empty( $media_dims ) )
                 $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";

trunk/src/wp-admin/options-general.php

@@ -74 +74 @@
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
 <td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?> 
+<?php if ( ! defined( 'WP_HOME' ) ) : ?>
 <p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
 <?php endif; ?>
@@ -199 +199 @@
             printf( $message,
                 '<code>' . date_i18n(
-                    get_option( 'date_format' ) . ' ' . get_option( 'time_format' ),
+                    __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
                     $tr['ts'] + ( $tz_offset - $tr['offset'] )
                 ) . '</code>'

trunk/src/wp-admin/update-core.php

@@ -575 +575 @@
     echo '<p>';
     /* translators: %1 date, %2 time. */
-    printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) );
+    printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ) ), date_i18n( __( 'g:i a' ) ) );
     echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
     echo '</p>';

trunk/src/wp-includes/media.php

@@ -2980 +2980 @@
         'subtype'     => $subtype,
         'icon'        => wp_mime_type_icon( $attachment->ID ),
-        'dateFormatted' => mysql2date( get_option('date_format'), $attachment->post_date ),
+        'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
         'nonces'      => array(
             'update' => false,