Ticket #30864: 30864.2.patch

src/wp-admin/admin.php

@@ -89 +89 @@
 
 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' );
 

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

@@ -565 +565 @@
         if ( 'auto-draft' != $post->post_status ) {
                 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>';
         } ?>

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

@@ -2128 +2128 @@
         }
 
         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' ) );
         }
 
         if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {

src/wp-admin/includes/dashboard.php

@@ -538 +538 @@
                 $title = _draft_or_post_title( $draft->ID );
                 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>';
                 }

src/wp-admin/includes/media.php

@@ -1442 +1442 @@
                         <td>
                         <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";
 

src/wp-admin/options-general.php

@@ -235 +235 @@
                                 __('Daylight saving time begins on: <code>%s</code>.') :
                                 __('Standard time begins on: <code>%s</code>.');
                         // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-                        printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
+                        printf( $message, date_i18n( __( 'F j, Y' ) . ' ' . __( 'g:i a' ) ), $tr['ts'] + ($tz_offset - $tr['offset']) );
                 } else {
                         _e('This timezone does not observe daylight saving time.');
                 }

src/wp-admin/update-core.php

@@ -555 +555 @@
 
         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>';
 

src/wp-includes/media.php

@@ -2734 +2734 @@
                 'type'        => $type,
                 '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,
                         'delete' => false,