WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve timezone wording. Props nbachiyski. see #3962 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-06 16:16:39 +00:00
parent dd1c8932aa
commit a259415cf5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/options-general.php
View File

@ -151,8 +151,13 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span> <span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
<?php if (get_option('timezone_string')) : ?> <?php if (get_option('timezone_string')) : ?>
<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($timezone_format)); ?></span> <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
<br /> <?php endif; ?>
<br/>
<span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
<br />
<span>
<?php if (get_option('timezone_string')) : ?>
<?php <?php
$now = localtime(time(),true); $now = localtime(time(),true);
if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.'); if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
@ -172,12 +177,12 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
if ( isset($found) && $found === true ) { if ( isset($found) && $found === true ) {
echo ' '; echo ' ';
$message = $tr['isdst'] ? $message = $tr['isdst'] ?
__('This timezone switches to daylight savings time on: %s.') : __('Daylight savings time begins on: <code>%s</code>.') :
__('This timezone switches to standard time on: %s.'); __('Standard time begins on: <code>%s</code>.');
$tz = new DateTimeZone($tzstring); $tz = new DateTimeZone($tzstring);
$d = new DateTime( "@{$tr['ts']}" ); $d = new DateTime( "@{$tr['ts']}" );
$d->setTimezone($tz); $d->setTimezone($tz);
printf( $message, /* translators: next daylight savings change time format, see http://php.net/date */ date_i18n(_x('Y-m-d G:i:s T', 'next daylight savings change time format'), $d->format('U') ) ); printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $d->format('U') ) );
} else { } else {
_e('This timezone does not observe daylight savings time.'); _e('This timezone does not observe daylight savings time.');
} }
@ -185,8 +190,6 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
?> ?>
</span> </span>
<?php endif; ?> <?php endif; ?>
<br/>
<span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
</td> </td>
<?php endif; ?> <?php endif; ?>