golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix DST/Standard transition display. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-03-15 01:57:36 +00:00
parent 95029985a6
commit 4794db9966
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,8 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
<br /> <br />
<span> <span>
<?php <?php
// Set TZ so localtime works.
date_default_timezone_set($tzstring);
$now = localtime(time(), true); $now = localtime(time(), true);
if ( $now['tm_isdst'] ) if ( $now['tm_isdst'] )
_e('This timezone is currently in daylight saving time.'); _e('This timezone is currently in daylight saving time.');
@ -202,8 +204,10 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
if ( function_exists('timezone_transitions_get') ) { if ( function_exists('timezone_transitions_get') ) {
$found = false; $found = false;
$date_time_zone_selected = new DateTimeZone($tzstring); $date_time_zone_selected = new DateTimeZone($tzstring);
$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
$right_now = time();
foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) { foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
if ( $tr['ts'] > time() ) { if ( $tr['ts'] > $right_now ) {
$found = true; $found = true;
break; break;
} }
@ -214,11 +218,14 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
$message = $tr['isdst'] ? $message = $tr['isdst'] ?
__('Daylight saving time begins on: <code>%s</code>.') : __('Daylight saving time begins on: <code>%s</code>.') :
__('Standard time begins on: <code>%s</code>.'); __('Standard time begins on: <code>%s</code>.');
printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] ) ); // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
} else { } else {
_e('This timezone does not observe daylight saving time.'); _e('This timezone does not observe daylight saving time.');
} }
} }
// Set back to UTC.
date_default_timezone_set('UTC');
?> ?>
</span> </span>
<?php endif; ?> <?php endif; ?>