From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 5 Apr 2004 11:48:16 +0000 (+0000)
Subject: adds international date/time support. am/pm thing is not standard, but I want
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=e4f5158ab033fbfc54a7b6f21fd30e958b891c9b;ds=sidebyside

adds international date/time support. am/pm thing is not standard, but I want
to follow user's hour_format preference. Time zone can be displayed as numbers.
O key instead of T.

mm/dd/yy and dd/mm/yy names replaced with human readable description.


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

diff --git a/include/options/folder.php b/include/options/folder.php
index 752ca892..7759fedc 100644
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -189,8 +189,9 @@ function load_optpage_data_folder() {
         'caption' => _("Show Clock on Folders Panel"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_FOLDERLIST,
-        'posvals' => array( '1' => 'MM/DD/YY HH:MM',
-                            '2' => 'DD/MM/YY HH:MM',
+        'posvals' => array( '0' => _("International date and time"),
+			    '1' => _("American date and time"),
+                            '2' => _("European date and time"),
                             '3' => _("Show weekday and time"),
                             '4' => _("Show time with seconds"),
                             '5' => _("Show time"),
diff --git a/src/left_main.php b/src/left_main.php
index 83175f63..ee283722 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -979,6 +979,9 @@ if ($date_format != 6) {
     }
 
     switch( $date_format ) {
+    case 0:
+	$clk = date('Y-m-d '.$hr. ' T', time());
+	break;
     case 1:
         $clk = date('m/d/y '.$hr, time());
         break;