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/Style.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'web/app/Style.js')

diff --git a/web/app/Style.js b/web/app/Style.js
index f4868aec3..309a3937e 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -22,8 +22,10 @@ Ext.define('Traccar.Style', {
     windowWidth: 640,
     windowHeight: 480,
 
-    dateTimeFormat: 'Y-m-d H:i:s',
-    timeFormat: 'H:i',
+    dateTimeFormat24: 'Y-m-d H:i:s',
+    dateTimeFormat12: 'Y-m-d g:i:s a',
+    timeFormat24: 'H:i',
+    timeFormat12: 'g:i a',
     dateFormat: 'Y-m-d',
     weekStartDay: 1,
 
-- 
cgit v1.2.3