From f57ed71e0a7cb5f6a9fa83d9860fdd7224af2326 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 18 Jun 2014 08:01:22 -0500
Subject: [PATCH] i18n: Format time dropdown via config time format
Use the admin-configured time format for formatting the values in the time
dropdown as opposed to always using 24-hour time.
---
include/class.misc.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/class.misc.php b/include/class.misc.php
index e0b9559b9..53fdc85e5 100644
--- a/include/class.misc.php
+++ b/include/class.misc.php
@@ -103,6 +103,8 @@ class Misc {
}
function timeDropdown($hr=null, $min =null,$name='time') {
+ global $cfg;
+
$hr =is_null($hr)?0:$hr;
$min =is_null($min)?0:$min;
@@ -129,7 +131,8 @@ class Misc {
$sel=($hr==$i && $min==$minute)?'selected="selected"':'';
$_minute=str_pad($minute, 2, '0',STR_PAD_LEFT);
$_hour=str_pad($i, 2, '0',STR_PAD_LEFT);
- echo sprintf('<option value="%s:%s" %s>%s:%s</option>',$_hour,$_minute,$sel,$_hour,$_minute);
+ $disp = date($cfg->getTimeFormat(), $i*3600 + $minute*60);
+ echo sprintf('<option value="%s:%s" %s>%s</option>',$_hour,$_minute,$sel,$disp);
}
}
echo '</select>';
--
GitLab