Changeset 1160

Timestamp:

02/29/2008 03:48:44 AM (18 years ago)

Author:

sambauers

Message:

Custom datetime and date formats in options. Props livibetter. Fixes #695

Location:

trunk

Files:

• bb-admin/admin-functions.php (modified) (1 diff)
• bb-admin/options-general.php (modified) (1 diff)
• bb-includes/locale.php (modified) (4 diffs)
• bb-includes/template-functions.php (modified) (1 diff)
• bb-templates/kakumei/search.php (modified) (2 diffs)

trunk/bb-admin/admin-functions.php

@@ -209 +209 @@
         $r .= "\t\t<td><a href='mailto:$email'>$email</a></td>\n";
     }
-    $r .= "\t\t<td>$user->user_registered</td>\n";
+    $r .= "\t\t<td>" . date( 'Y-m-d H:i:s', bb_offset_time( bb_gmtstrtotime( $user->user_registered ) ) ) . "</td>\n";
     $actions = '';
     if ( bb_current_user_can( 'edit_user', $user_id ) )

trunk/bb-admin/options-general.php

@@ -104 +104 @@
             <p><?php _e('Example: -7 for Pacific Daylight Time.'); ?></p>
         </div>
+        <label for="datetime_format">
+            <?php _e('Date and time format:') ?>
+        </label>
+        <div>
+            <input class="text" name="datetime_format" id="datetime_format" value="<?php echo(attribute_escape(bb_get_datetime_formatstring_i18n())); ?>" />
+            <p><?php printf(__('Output: <strong>%s</strong>'), bb_datetime_format_i18n( bb_current_time() )); ?></p>
+        </div>
+        <label for="date_format">
+            <?php _e('Date format:') ?>
+        </label>
+        <div>
+            <input class="text" name="date_format" id="date_format" value="<?php echo(attribute_escape(bb_get_datetime_formatstring_i18n('date'))); ?>" />
+            <p><?php printf(__('Output: <strong>%s</strong>'), bb_datetime_format_i18n( bb_current_time(), 'date' )); ?></p>
+            <p><?php _e('Click "Update options" to update sample output.') ?></p>
+            <p><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>.'); ?></p>
+        </div>
     </fieldset>
     <fieldset>

trunk/bb-includes/locale.php

@@ -12 +12 @@
 
     var $meridiem;
+    var $number_format;
+    var $datetime_formatstring;
 
     var $text_direction = '';
@@ -100 +102 @@
         $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; 
         
+        // Date/Time formatting
+        
+        $this->datetime_formatstring['datetime'] = __('F j, Y - h:i A');
+        $this->datetime_formatstring['date'] = __('F j, Y');
+        $this->datetime_formatstring['time'] = __('h:i A');
+        
         $this->_load_locale_data();
     }
@@ -142 +150 @@
     function get_meridiem($meridiem) {
         return $this->meridiem[$meridiem];
+    }
+
+    function get_datetime_formatstring($type = 'datetime') {
+        return $this->datetime_formatstring[$type];
     }
 
@@ -183 +195 @@
 }
 
+function bb_get_datetime_formatstring_i18n( $type = 'datetime' ) {
+    $formatstring = bb_get_option( $type . '_format' );
+    if ( empty($formatstring) ) {
+        global $bb_locale;
+        $formatstring = $bb_locale->get_datetime_formatstring( $type );
+    }
+    return $formatstring;
+}
+
+function bb_datetime_format_i18n( $unixtimestamp, $type = 'datetime', $formatstring = '' ) {
+    if ( empty($formatstring) ) {
+        $formatstring = bb_get_datetime_formatstring_i18n( $type );
+    }
+    return bb_gmdate_i18n( $formatstring, bb_offset_time( $unixtimestamp ) );
+}
+
 function bb_number_format_i18n($number, $decimals = null) {
     global $bb_locale;

trunk/bb-includes/template-functions.php

@@ -1420 +1420 @@
     echo "<dl id='userinfo'>\n";
     echo "\t<dt>" . __('Member Since') . "</dt>\n";
-    echo "\t<dd>" . bb_gmdate_i18n(__('F j, Y'), $reg_time) . ' (' . bb_since($reg_time) . ")</dd>\n";
+    echo "\t<dd>" . bb_datetime_format_i18n($reg_time, 'date') . ' (' . bb_since($reg_time) . ")</dd>\n";
     if ( is_array( $profile_info_keys ) ) {
         foreach ( $profile_info_keys as $key => $label ) {

trunk/bb-templates/kakumei/search.php

@@ -14 +14 @@
 <li><h4><a href="<?php post_link(); ?>"><?php topic_title($bb_post->topic_id); ?></a></h4>
 <p><?php echo bb_show_context($q, $bb_post->post_text); ?></p>
-<p><small><?php _e('Posted') ?> <?php bb_post_time( __('F j, Y, h:i A') ); ?></small></p>
+<p><small><?php _e('Posted') ?> <?php echo bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ); ?></small></p>
 </li>
 <?php endforeach; ?>
@@ -26 +26 @@
 <li><h4><a href="<?php post_link(); ?>"><?php topic_title($bb_post->topic_id); ?></a></h4>
 <p><?php echo bb_show_context($q, $bb_post->post_text); ?></p>
-<p><small><?php _e('Posted') ?> <?php bb_post_time( __('F j, Y, h:i A') ); ?></small></p>
+<p><small><?php _e('Posted') ?> <?php echo bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ); ?></small></p>
 </li>
 <?php endforeach; ?>