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

Code standards cleanup for wp-admin/options-general.php 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-03-06 09:49:11 +00:00
parent cc8d80cd44
commit 7ac692af5f
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ $check_zone_info = true;
if ( false !== strpos($tzstring,'Etc/GMT') ) if ( false !== strpos($tzstring,'Etc/GMT') )
$tzstring = ''; $tzstring = '';
if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
$check_zone_info = false; $check_zone_info = false;
if ( 0 == $current_offset ) if ( 0 == $current_offset )
$tzstring = 'UTC+0'; $tzstring = 'UTC+0';
@ -182,7 +182,7 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
</select> </select>
<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(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span> <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
<?php endif; ?> <?php endif; ?>
<br /> <br />
@ -191,27 +191,30 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
<br /> <br />
<span> <span>
<?php <?php
$now = localtime(time(),true); $now = localtime(time(), true);
if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.'); if ( $now['tm_isdst'] )
else _e('This timezone is currently in standard time.'); _e('This timezone is currently in daylight saving time.');
else
_e('This timezone is currently in standard time.');
?> ?>
<br /> <br />
<?php <?php
if (function_exists('timezone_transitions_get')) { if ( function_exists('timezone_transitions_get') ) {
$dateTimeZoneSelected = new DateTimeZone($tzstring); $found = false;
foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) { $date_time_zone_selected = new DateTimeZone($tzstring);
if ($tr['ts'] > time()) { foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
if ( $tr['ts'] > time() ) {
$found = true; $found = true;
break; break;
} }
} }
if ( isset($found) && $found === true ) { if ( $found ) {
echo ' '; echo ' ';
$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'] ) ); printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] ) );
} else { } else {
_e('This timezone does not observe daylight saving time.'); _e('This timezone does not observe daylight saving time.');
} }
@ -236,13 +239,13 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
'd/m/Y', 'd/m/Y',
) ); ) );
$custom = TRUE; $custom = true;
foreach ( $date_formats as $format ) { foreach ( $date_formats as $format ) {
echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'"; echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'";
if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "===" if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
echo " checked='checked'"; echo " checked='checked'";
$custom = FALSE; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
} }
@ -268,13 +271,13 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
'H:i', 'H:i',
) ); ) );
$custom = TRUE; $custom = true;
foreach ( $time_formats as $format ) { foreach ( $time_formats as $format ) {
echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'"; echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'";
if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "===" if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
echo " checked='checked'"; echo " checked='checked'";
$custom = FALSE; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
} }