diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 184d5c2731..b1fa18f01e 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -89,8 +89,8 @@ if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) 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' ); diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 939f77ee1c..7895be6c5e 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -199,7 +199,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved printf( __( '%1$s at %2$s' ), /* 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 ) ); ?> diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index aff0413182..c5019fc426 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -631,9 +631,9 @@ if ( post_type_supports($post_type, 'editor') ) { if ( 'auto-draft' != $post->post_status ) { echo ''; 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 ''; } ?> diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 47a1fb0eb6..29a11fc235 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -1237,7 +1237,7 @@ function wp_ajax_add_meta() { $post_data['post_type'] = $post->post_type; $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 ); if ( $pid ) { @@ -2227,11 +2227,11 @@ function wp_ajax_wp_fullscreen_save_post() { } 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 ) ) { diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index a7c6d869cf..320860d235 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -720,7 +720,7 @@ class WP_Comments_List_Table extends WP_List_Table { printf( __( '%1$s at %2$s' ), /* 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 ''; echo ''; diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 144fcc04fc..42da6ea9c8 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -550,7 +550,7 @@ function wp_dashboard_recent_drafts( $drafts = false ) { $title = _draft_or_post_title( $draft->ID ); echo "
  • \n"; echo '
    ' . esc_html( $title ) . ''; - echo '
    '; + echo ''; if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) { echo '

    ' . $the_content . '

    '; } diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 9990b9fd1b..2d48dee2e7 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1455,7 +1455,7 @@ function get_media_item( $attachment_id, $args = null ) {

    " . __('File name:') . " $filename

    " . __('File type:') . " $post->post_mime_type

    -

    " . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ). '

    '; +

    " . __('Upload date:') . " " . mysql2date( __( 'F j, Y' ), $post->post_date ). '

    '; if ( !empty( $media_dims ) ) $item .= "

    " . __('Dimensions:') . " $media_dims

    \n"; diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 220b07e80c..2a704ce928 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -73,7 +73,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); class="regular-text code" /> - +

    want your site home page to be different from your WordPress installation directory.' ); ?>

    @@ -198,7 +198,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists // 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' ), + __( 'F j, Y' ) . ' ' . __( 'g:i a' ), $tr['ts'] + ( $tz_offset - $tr['offset'] ) ) . '' ); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 0e698a57c2..ee47d2f80e 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -574,7 +574,7 @@ if ( 'upgrade-core' == $action ) { echo '

    '; /* 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 '   ' . __( 'Check Again' ) . ''; echo '

    '; diff --git a/wp-includes/media.php b/wp-includes/media.php index ddd7088a1d..3713beabf9 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -2979,7 +2979,7 @@ function wp_prepare_attachment_for_js( $attachment ) { '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, diff --git a/wp-includes/version.php b/wp-includes/version.php index ce938bb0ea..699dce8a22 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-35810'; +$wp_version = '4.5-alpha-35811'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.