瀏覽代碼

24hr date format should include a leading 0... Not seen any clocks without
one yet.

jangliss 20 年之前
父節點
當前提交
3cfbbc5467
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 1 0
      ChangeLog
  2. 4 4
      functions/date.php

+ 1 - 0
ChangeLog

@@ -190,6 +190,7 @@ Version 1.5.1 -- CVS
     [CAN-2005-0103]
     [CAN-2005-0103]
   - Security: Fix possible XSS issues in src/webmail.php. [CAN-2005-0104]
   - Security: Fix possible XSS issues in src/webmail.php. [CAN-2005-0104]
   - Fix undefined variables in src/webmail.php.
   - Fix undefined variables in src/webmail.php.
+  - 24hr clock format should include a leading 0.
 
 
 Version 1.5.0
 Version 1.5.0
 --------------------
 --------------------

+ 4 - 4
functions/date.php

@@ -315,7 +315,7 @@ function getLongDateString( $stamp ) {
     if ( $hour_format == SMPREF_TIME_12HR ) {
     if ( $hour_format == SMPREF_TIME_12HR ) {
         $date_format = _("D, F j, Y g:i a");
         $date_format = _("D, F j, Y g:i a");
     } else {
     } else {
-        $date_format = _("D, F j, Y G:i");
+        $date_format = _("D, F j, Y H:i");
     }
     }
 
 
     return( date_intl( $date_format, $stamp ) );
     return( date_intl( $date_format, $stamp ) );
@@ -367,14 +367,14 @@ function getDateString( $stamp ) {
         if ( $hour_format == SMPREF_TIME_12HR ) {
         if ( $hour_format == SMPREF_TIME_12HR ) {
             $date_format = _("g:i a");
             $date_format = _("g:i a");
         } else {
         } else {
-            $date_format = _("G:i");
+            $date_format = _("H:i");
         }
         }
     } else if ($midnight - 518400 < $stamp) {
     } else if ($midnight - 518400 < $stamp) {
         /* This week */
         /* This week */
         if ( $hour_format == SMPREF_TIME_12HR ) {
         if ( $hour_format == SMPREF_TIME_12HR ) {
             $date_format = _("D, g:i a");
             $date_format = _("D, g:i a");
         } else {
         } else {
-            $date_format = _("D, G:i");
+            $date_format = _("D, H:i");
         }
         }
     } else {
     } else {
         /* before this week */
         /* before this week */
@@ -455,4 +455,4 @@ function getTimeStamp($dateParts) {
       return ($mtime);
       return ($mtime);
    }
    }
 */
 */
-?>
+?>