From 2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 13 Mar 2016 13:07:30 +1300
Subject: Support 12 hour format in web

---
 web/app/view/Devices.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'web/app/view/Devices.js')

diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 2e9509609..b464ed561 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -114,7 +114,11 @@ Ext.define('Traccar.view.Devices', {
                         metaData.tdCls = 'status-color-unknown';
                         break;
                 }
-                return Ext.Date.format(value, Traccar.Style.dateTimeFormat);
+                if (Traccar.app.getPreference('twelveHourFormat', false)) {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat12);
+                } else {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
+                }
             }
         }
     }]
-- 
cgit v1.2.3