Ticket #35064: 35064.2.patch

src/wp-admin/css/forms.css

@@ -655 +655 @@
         margin-bottom: 0;
 }
 
+.form-table p.timezone-info {
+        margin: 1em 0;
+}
+
 .form-table td fieldset label {
         margin: 0.25em 0 0.5em !important;
         display: inline-block;
@@ -893 +897 @@
   20.0 - Settings
 ------------------------------------------------------------------------------*/
 
-#utc-time, #local-time {
-        padding-left: 25px;
+#utc-time,
+#local-time {
         font-style: italic;
 }
 
+.timezone-info code {
+        white-space: nowrap;
+}
+
 .defaultavatarpicker .avatar {
         margin: 2px 0;
         vertical-align: middle;
@@ -1128 +1136 @@
 
         .form-table th,
         .form-table td,
-        .label-responsive {
+        .label-responsive,
+        .span-responsive {
                 display: block;
                 width: auto;
                 vertical-align: middle;
@@ -1268 +1277 @@
                 display: block;
         }
 
-        #utc-time {
-                margin-top: 10px;
-        }
-
         #utc-time,
         #local-time {
                 display: block;
                 float: none;
-                padding: 0;
-                line-height: 2;
+                margin-top: 0.5em;
         }
 
         .form-field #domain {

src/wp-admin/options-general.php

@@ -145 +145 @@
 <?php echo wp_timezone_choice($tzstring); ?>
 </select>
 
+<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
+<?php if ($check_zone_info && $tzstring) : ?>
+
+<p class="timezone-info">
         <span id="utc-time"><?php
-                /* translators: %s: UTC time */
-                printf( __( '<abbr title="Coordinated Universal Time">UTC</abbr> time is %s' ),
-                        '<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
+                /* translators: 1: UTC abbreviation, 2: UTC time */
+                printf( __( 'Universal time (%1$s) is %2$s' ),
+                        '<abbr>' . __( 'UTC' ) . '</abbr>',
+                        '<span class="span-responsive"><code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code></span>'
                 );
         ?></span>
-<?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
+<?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
         <span id="local-time"><?php
                 /* translators: %s: local time */
                 printf( __( 'Local time is %s' ),
-                        '<code>' . date_i18n( $timezone_format ) . '</code>'
+                        '<span class="span-responsive"><code>' . date_i18n( $timezone_format ) . '</code></span>'
                 );
         ?></span>
 <?php endif; ?>
-<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
-<?php if ($check_zone_info && $tzstring) : ?>
-<br />
+</p>
+
+<p class="timezone-info">
 <span>
         <?php
         // Set TZ so localtime works.
@@ -192 +197 @@
                         echo ' ';
                         $message = $tr['isdst'] ?
                                 /* translators: %s: date and time  */
-                                __( 'Daylight saving time begins on: %s.')  :
+                                __( 'Daylight saving time begins on: %s')  :
                                 /* translators: %s: date and time  */
-                                __( 'Standard time begins on: %s.' );
+                                __( 'Standard time begins on: %s' );
                         // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
                         printf( $message,
-                                '<code>' . date_i18n(
+                                '<span class="span-responsive"><code>' . date_i18n(
                                         __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
                                         $tr['ts'] + ( $tz_offset - $tr['offset'] )
-                                ) . '</code>'
+                                ) . '</code></span>'
                         );
                 } else {
                         _e( 'This timezone does not observe daylight saving time.' );
@@ -211 +216 @@
         ?>
         </span>
 <?php endif; ?>
+</p>
 </td>
 
 </tr>
@@ -232 +238 @@
         $custom = true;
 
         foreach ( $date_formats as $format ) {
-                echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'";
+                echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
                 if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
                         echo " checked='checked'";
                         $custom = false;
                 }
-                echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
+                echo ' /> ' . date_i18n( $format ) . ' <code>' . $format . "</code></label><br />\n";
         }
 
         echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -265 +271 @@
         $custom = true;
 
         foreach ( $time_formats as $format ) {
-                echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'";
+                echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
                 if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
                         echo " checked='checked'";
                         $custom = false;
                 }
-                echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
+                echo ' /> ' . date_i18n( $format ) . ' <code>' . $format . "</code></label><br />\n";
         }
 
         echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';