WordPress.org

Make WordPress Core

Changeset 10878


Ignore:
Timestamp:
04/06/2009 04:16:39 PM (9 years ago)
Author:
ryan
Message:

Improve timezone wording. Props nbachiyski. see #3962

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options-general.php

    r10836 r10878  
    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<span>
     160<?php if (get_option('timezone_string')) : ?>
    156161    <?php
    157162    $now = localtime(time(),true);
     
    173178            echo ' ';
    174179            $message = $tr['isdst'] ?
    175                 __('This timezone switches to daylight savings time on: %s.') :
    176                 __('This timezone switches to standard time on: %s.');
     180                __('Daylight savings time begins on: <code>%s</code>.') :
     181                __('Standard time begins  on: <code>%s</code>.');
    177182            $tz = new DateTimeZone($tzstring);
    178183            $d = new DateTime( "@{$tr['ts']}" );
    179184            $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') ) );
     185            printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $d->format('U') ) );
    181186        } else {
    182187            _e('This timezone does not observe daylight savings time.');
     
    186191    </span>
    187192<?php endif; ?>
    188 <br/>
    189 <span class="setting-description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
    190193</td>
    191194
Note: See TracChangeset for help on using the changeset viewer.