Ticket #47832: 47832.3.diff

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

@@ -167 +167 @@
 }
 
 /* translators: Publish box date format, see https://secure.php.net/date */
-$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
+$scheduled_date = sprintf(
+        /* translators: Publish box datetime format. 1: Date, 2: Time. */
+        __( '%1$s at %2$s' ),
+        date_i18n( _x( 'M j, Y', 'publish box date format. See https://secure.php.net/date' ), strtotime( $post->post_date ) ),
+        date_i18n( _x( 'H:i', 'publish box time format. See https://secure.php.net/date' ), strtotime( $post->post_date ) )
+);
 
 $messages['post']       = array(
         0  => '', // Unused. Messages start at index 1.

src/wp-admin/includes/meta-boxes.php

@@ -194 +194 @@
 </div><!-- .misc-pub-section -->
 
         <?php
-        /* translators: Publish box date format, see https://secure.php.net/date */
-        $datef = __( 'M j, Y @ H:i' );
+        /* translators: Publish box datetime format. 1: Date, 2: Time. */
+        $datef      = __( '%1$s at %2$s' );
+        $datef_date = _x( 'M j, Y', 'publish box date format. See https://secure.php.net/date' );
+        $datef_time = _x( 'H:i', 'publish box time format. See https://secure.php.net/date' );
         if ( 0 != $post->ID ) {
                 if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
                         /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
@@ -212 +214 @@
                         /* translators: Post date information. %s: Date on which the post is to be published. */
                         $stamp = __( 'Publish on: <b>%s</b>' );
                 }
-                $date = date_i18n( $datef, strtotime( $post->post_date ) );
+                $date = sprintf(
+                        $datef,
+                        date_i18n( $datef_date, strtotime( $post->post_date ) ),
+                        date_i18n( $datef_time, strtotime( $post->post_date ) )
+                );
         } else { // draft (no saves, and thus no date specified)
                 $stamp = __( 'Publish <b>immediately</b>' );
-                $date  = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
+                $date  = sprintf(
+                        $datef,
+                        date_i18n( $datef_date, strtotime( current_time( 'mysql' ) ) ),
+                        date_i18n( $datef_time, strtotime( current_time( 'mysql' ) ) )
+                );
         }
 
         if ( ! empty( $args['args']['revisions_count'] ) ) :

src/wp-admin/includes/template.php

@@ -824 +824 @@
 
         echo '<div class="timestamp-wrap">';
         /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
-        printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
+        printf( __( '%1$s %2$s, %3$s at %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
 
         echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 

src/wp-includes/script-loader.php

@@ -1585 +1585 @@
                                 'publishOnFuture'    => __( 'Schedule for:' ),
                                 'publishOnPast'      => __( 'Published on:' ),
                                 /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
-                                'dateFormat'         => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
+                                'dateFormat'         => __( '%1$s %2$s, %3$s at %4$s:%5$s' ),
                                 'showcomm'           => __( 'Show more comments' ),
                                 'endcomm'            => __( 'No more comments found.' ),
                                 'publish'            => __( 'Publish' ),