Changeset 9616

Timestamp:

11/11/2008 07:56:35 PM (16 years ago)

Author:

ryan

Message:

Use localized dates on General Options page. Props nbachiyski. fixes #8153

Location:

trunk

Files:

• wp-admin/options-general.php (modified) (3 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/options-general.php

@@ -120 +120 @@
 </select>
 <?php _e('hours') ?>
-<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), gmdate(__('Y-m-d G:i:s'))); ?></span>
+<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n(__('Y-m-d G:i:s'), false, 'gmt')); ?></span>
 <?php if ($current_offset) : ?>
-    <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, gmdate(__('Y-m-d G:i:s'), current_time('timestamp'))); ?></span>
+    <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n(__('Y-m-d G:i:s'))); ?></span>
 <?php endif; ?>
 <br/>
@@ -149 +149 @@
             $custom = FALSE;
         }
-        echo ' /> ' . gmdate( $format, current_time('timestamp') ) . "</label><br />\n";
+        echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
     }
 
     echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
     checked( $custom, TRUE );
-    echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n";
+    echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . date_i18n( get_option('date_format') ) . "\n";
 
     echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n";
@@ -181 +181 @@
             $custom = FALSE;
         }
-        echo ' /> ' . gmdate( $format, current_time('timestamp') ) . "</label><br />\n";
+        echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
     }
 
     echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
     checked( $custom, TRUE );
-    echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n";
+    echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . date_i18n( get_option('time_format') ) . "\n";
 ?>
     </fieldset>

trunk/wp-admin/wp-admin.css

@@ -1314 +1314 @@
 
 .form-table input.small-text {
-    width: 40px;
+    width: 50px;
 }
 

trunk/wp-includes/functions.php

@@ -113 +113 @@
  * @return string The date, translated if locale specifies it.
  */
-function date_i18n( $dateformatstring, $unixtimestamp ) {
+function date_i18n( $dateformatstring, $unixtimestamp, $gmt = false ) {
     global $wp_locale;
     $i = $unixtimestamp;
     // Sanity check for PHP 5.1.0-
-    if ( -1 == $i )
-        $i = false;
+    if ( intval($i) < 1 )
+        $i = time();
 
     if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
@@ -137 +137 @@
         $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
     }
-    $j = @date( $dateformatstring, $i );
+    $j = $gmt? @gmdate( $dateformatstring, $i ) : @date( $dateformatstring, $i );
     return $j;
 }