Changeset 33340

Timestamp:

07/21/2015 11:39:20 AM (9 years ago)

Author:

iseulde

Message:

Publish box: fix strange date format after change

Part props tyxla.
Fixes #30716.

Location:

trunk/src

Files:

• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/post.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -785 +785 @@
     for ( $i = 1; $i < 13; $i = $i +1 ) {
         $monthnum = zeroise($i, 2);
-        $month .= "\t\t\t" . '<option value="' . $monthnum . '" ' . selected( $monthnum, $mm, false ) . '>';
+        $monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
+        $month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
         /* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-        $month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) ) . "</option>\n";
+        $month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
     }
     $month .= '</select></label>';
@@ -798 +799 @@
     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 @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
 
     echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';

trunk/src/wp-admin/js/post.js

@@ -559 +559 @@
             } else {
                 $('#timestamp').html(
-                    publishOn + ' <b>' +
-                    postL10n.dateFormat.replace( '%1$s', $('option[value="' + $('#mm').val() + '"]', '#mm').text() )
+                    '\n' + publishOn + ' <b>' +
+                    postL10n.dateFormat
+                        .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
                         .replace( '%2$s', jj )
                         .replace( '%3$s', aa )

trunk/src/wp-includes/script-loader.php

@@ -488 +488 @@
             '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 @ %4$s:%5$s'),
             'showcomm' => __('Show more comments'),
             'endcomm' => __('No more comments found.'),