WordPress 4.5

[autoinstalls/wordpress.git] / wp-admin / options-general.php

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 220b07e80c1aa7ce0bf07586fbf607f47ceba553..9091d5e3eb797545e42670a3f56083ad278e53a1 100644 (file)
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -73,7 +73,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
 <td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?> 
+<?php if ( ! defined( 'WP_HOME' ) ) : ?>
 <p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
 <?php endif; ?>
 </tr>
@@ -105,10 +105,15 @@ $new_admin_email = get_option( 'new_admin_email' );
 if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
 <p><?php
-       /* translators: 1: new admin email, 2: Cancel link URL */
-       printf( __( 'There is a pending change of the admin email to %1$s. <a href="%2$s">Cancel</a>' ),
-               '<code>' . esc_html( $new_admin_email ) . '</code>',
-               esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) )
+       printf(
+               /* translators: %s: new admin email */
+               __( 'There is a pending change of the admin email to %s.' ),
+               '<code>' . esc_html( $new_admin_email ) . '</code>'
+       );
+       printf(
+               ' <a href="%1$s">%2$s</a>',
+               esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ),
+               __( 'Cancel' )
        );
 ?></p>
 </div>
@@ -145,23 +150,28 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <?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>
+
+<p class="timezone-info">
        <span id="utc-time"><?php
-               /* translators: %s: UTC time */
-               printf( __( '<abbr title="Coordinated Universal Time">UTC</abbr> time is %s' ),
+               /* translators: 1: UTC abbreviation, 2: UTC time */
+               printf( __( 'Universal time (%1$s) is %2$s.' ),
+                       '<abbr>' . __( 'UTC' ) . '</abbr>',
                        '<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
                );
        ?></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' ),
+               printf( __( 'Local time is %s.' ),
                        '<code>' . date_i18n( $timezone_format ) . '</code>'
                );
        ?></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>
+
+<?php if ( $check_zone_info && $tzstring ) : ?>
+<p class="timezone-info">
 <span>
        <?php
        // Set TZ so localtime works.
@@ -198,7 +208,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,
                                '<code>' . date_i18n(
-                                       get_option( 'date_format' ) . ' ' . get_option( 'time_format' ),
+                                       __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
                                        $tr['ts'] + ( $tz_offset - $tr['offset'] )
                                ) . '</code>'
                        );
@@ -210,6 +220,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
        date_default_timezone_set('UTC');
        ?>
        </span>
+</p>
 <?php endif; ?>
 </td>
 
@@ -232,18 +243,21 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
        $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 ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $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"';
+       echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );
-       echo '/> ' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . "</span></label>\n";
-       echo '<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label><input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="screen-reader-text">' . __( 'example:' ) . ' </span><span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <span class='spinner'></span>\n";
+       echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></label>' .
+               '<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
+               '<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" /></span>' .
+               '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
+               "<span class='spinner'></span>\n";
 ?>
        </fieldset>
 </td>
@@ -265,20 +279,23 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
        $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 ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $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"';
+       echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );
-       echo '/> ' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . "</span></label>\n";
-       echo '<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label><input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="screen-reader-text">' . __( 'example:' ) . ' </span><span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <span class='spinner'></span>\n";
+       echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></label>' .
+               '<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
+               '<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" /></span>' .
+               '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
+               "<span class='spinner'></span>\n";
 
-       echo "\t<p>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+       echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>
        </fieldset>
 </td>