WordPress 4.7.2

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

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 426ebaae10343d8c0e98448afb0397a6140a3d32..22d475c2e206ae7716a67b8952fd463e848bd074 100644 (file)
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -42,8 +42,8 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen" target="_blank">Documentation on General Settings</a>') . '</p>' .
-       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen">Documentation on General Settings</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -147,17 +147,17 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <td>
 
 <select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
-<?php echo wp_timezone_choice($tzstring); ?>
+       <?php echo wp_timezone_choice( $tzstring, get_user_locale() ); ?>
 </select>
 
-<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
+<p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
 
 <p class="timezone-info">
        <span id="utc-time"><?php
                /* 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>'
+                       '<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
                );
        ?></span>
 <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>