diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-13 13:07:30 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-13 13:07:30 +1300 |
commit | 2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e (patch) | |
tree | 85b17d225d570d3cc1fdffce274d1beb26926cc3 /web/app/view/Devices.js | |
parent | 984feba192d0b347b99c550009ec6fd078728ca2 (diff) | |
download | trackermap-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.tar.gz trackermap-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.tar.bz2 trackermap-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.zip |
Support 12 hour format in web
Diffstat (limited to 'web/app/view/Devices.js')
-rw-r--r-- | web/app/view/Devices.js | 6 |
1 files changed, 5 insertions, 1 deletions
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); + } } } }] |