-<?php _e('hours') ?><br />
-<?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), gmdate(__('Y-m-d G:i:s'))); ?><br />
-<?php if ($current_offset) printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, gmdate(__('Y-m-d G:i:s'), current_time('timestamp'))); ?><br />
-<?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?>
+
+ <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')) : ?>
+ <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
+<?php endif; ?>
+<br />
+<span class="description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
+<br />
+<span>
+<?php if ($tzstring) : ?>
+ <?php
+ $now = localtime(time(),true);
+ if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
+ else _e('This timezone is currently in standard time.');
+ ?>
+ <br />
+ <?php
+ if (function_exists('timezone_transitions_get')) {
+ $dateTimeZoneSelected = new DateTimeZone($tzstring);
+ foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
+ if ($tr['ts'] > time()) {
+ $found = true;
+ break;
+ }
+ }
+
+ if ( isset($found) && $found === true ) {
+ echo ' ';
+ $message = $tr['isdst'] ?
+ __('Daylight savings 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'] ) );
+ } else {
+ _e('This timezone does not observe daylight savings time.');
+ }
+ }
+ ?>
+ </span>
+<?php endif; ?>