WordPress.org

Make WordPress Core

Ticket #3962: timezone-wording.diff

File timezone-wording.diff, 2.1 KB (added by nbachiyski, 9 years ago)
  • wp-admin/options-general.php

     
    151151
    152152    <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>
    153153<?php if (get_option('timezone_string')) : ?>
    154         <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($timezone_format)); ?></span>
    155         <br />
     154        <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
     155<?php endif; ?>
     156<br/>
     157<span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
     158<br />
     159<?php if (get_option('timezone_string')) : ?>
    156160        <?php
    157161        $now = localtime(time(),true);
    158162        if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
     
    172176                if ( isset($found) && $found === true ) {
    173177                        echo ' ';
    174178                        $message = $tr['isdst'] ?
    175                                 __('This timezone switches to daylight savings time on: %s.') :
    176                                 __('This timezone switches to standard time on: %s.');
     179                                __('Daylight savings time begins on: <code>%s</code>. You will have to move your clock 1 hour forward.') :
     180                                __('Standard time begins  on: <code>%s</code>. You will have to move your clock 1 hour backwards.');
    177181                        $tz = new DateTimeZone($tzstring);
    178182                        $d = new DateTime( "@{$tr['ts']}" );
    179183                        $d->setTimezone($tz);
    180                         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') ) );
     184                        printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $d->format('U') ) );
    181185                } else {
    182186                        _e('This timezone does not observe daylight savings time.');
    183187                }
     
    185189        ?>
    186190        </span>
    187191<?php endif; ?>
    188 <br/>
    189 <span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
    190192</td>
    191193
    192194<?php endif; ?>