Ticket #17525: 17525.patch

wp-includes/comment-template.php

@@ -1798 +1798 @@
 
                 <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
                         <?php
-                                /* translators: 1: date, 2: time */
-                                printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+                                if ( get_option('datetime_format') == 0 ) {
+                                        printf( __( '%1$s , %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+                                }
+                                elseif ( get_option('datetime_format') == 1 ) {
+                                        printf( __( '%1$s , %2$s' ), get_comment_time(),  get_comment_date() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+                                }                               
+                                elseif ( get_option('datetime_format') == 2 ) {
+                                        printf( __( '%1$s , %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+                                }                               
+                                else {
+                                        printf( __( '%1$s , %2$s' ), get_comment_time(),  get_comment_date() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+                                }                               
                         ?>
                 </div>
 
@@ -1840 +1850 @@
                                         <div class="comment-metadata">
                                                 <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
                                                         <time datetime="<?php comment_time( 'c' ); ?>">
-                                                                <?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
+                                                                <?php
+                                                                        if( get_option('datetime_format') == 0 )
+                                                                                printf( _x( '%1$s , %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() );
+                                                                        elseif( get_option('datetime_format') == 1 )
+                                                                                printf( _x( '%1$s , %2$s', '1: time, 2: date' ), get_comment_time(), get_comment_date() );
+                                                                        elseif( get_option('datetime_format') == 2 )
+                                                                                printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() );
+                                                                        else
+                                                                                printf( _x( '%1$s on %2$s', '1: time, 2: date' ), get_comment_time(), get_comment_date() );
+                                                                ?>
                                                         </time>
                                                 </a>
                                                 <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>

wp-admin/options.php

@@ -70 +70 @@
         wp_die(__('Cheatin’ uh?'));
 
 $whitelist_options = array(
-        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
+        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'datetime_format', 'start_of_week', 'timezone_string' ),
         'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
         'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),

wp-admin/options-general.php

@@ -290 +290 @@
 </td>
 </tr>
 <tr>
+<th scope="row"><label for="datetime_format"><?php _e('Date/Time Display Format') ?></label></th>
+<td><select name="datetime_format" id="datetime_format">
+<?php
+for ($datetime_index = 0; $datetime_index <= 3; $datetime_index++) :
+        $selected = (get_option('datetime_format') == $datetime_index) ? 'selected="selected"' : '';
+        if ( 0 == $datetime_index ) {   
+                echo "\n\t<option value='" . esc_attr($datetime_index) . "' $selected>" . __("'Date','Time'") . '</option>';
+        }
+        elseif ( 1 == $datetime_index ) {       
+                echo "\n\t<option value='" . esc_attr($datetime_index) . "' $selected>" . __("'Time','Date'") . '</option>';
+        }       
+        elseif ( 2 == $datetime_index ) {       
+                echo "\n\t<option value='" . esc_attr($datetime_index) . "' $selected>" . __("'Date' at 'Time'") . '</option>';
+        }
+        else {  
+                echo "\n\t<option value='" . esc_attr($datetime_index) . "' $selected>" . __("'Time' on 'Date'") . '</option>';
+        }               
+endfor;
+?>
+</select></td>
+</tr>
+<tr>
 <th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
 <td><select name="start_of_week" id="start_of_week">
 <?php