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

one yet.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8705 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 9e2177bce89d35f3e0071851deaacb1312d68598..d7d0d3eca3699cf6015344dea3ac149be865a0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -190,6 +190,7 @@ Version 1.5.1 -- CVS
     [CAN-2005-0103]
   - Security: Fix possible XSS issues in src/webmail.php. [CAN-2005-0104]
   - Fix undefined variables in src/webmail.php.
+  - 24hr clock format should include a leading 0.
 
 Version 1.5.0
 --------------------

diff --git a/functions/date.php b/functions/date.php
index a2a88566a1accca707bc08bf9b329c810f960bcb..6371d25d4b20cd3935f3c701d41438a0213f03d7 100644 (file)
--- a/functions/date.php
+++ b/functions/date.php
@@ -315,7 +315,7 @@ function getLongDateString( $stamp ) {
     if ( $hour_format == SMPREF_TIME_12HR ) {
         $date_format = _("D, F j, Y g:i a");
     } else {
-        $date_format = _("D, F j, Y G:i");
+        $date_format = _("D, F j, Y H:i");
     }
 
     return( date_intl( $date_format, $stamp ) );
@@ -367,14 +367,14 @@ function getDateString( $stamp ) {
         if ( $hour_format == SMPREF_TIME_12HR ) {
             $date_format = _("g:i a");
         } else {
-            $date_format = _("G:i");
+            $date_format = _("H:i");
         }
     } else if ($midnight - 518400 < $stamp) {
         /* This week */
         if ( $hour_format == SMPREF_TIME_12HR ) {
             $date_format = _("D, g:i a");
         } else {
-            $date_format = _("D, G:i");
+            $date_format = _("D, H:i");
         }
     } else {
         /* before this week */
@@ -455,4 +455,4 @@ function getTimeStamp($dateParts) {
       return ($mtime);
    }
 */
-?>
\ No newline at end of file
+?>