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/AttributeFormatter.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/AttributeFormatter.js')
| -rw-r--r-- | web/app/AttributeFormatter.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 1cbc1cfc0..3432ca1e0 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -40,7 +40,11 @@ Ext.define('Traccar.AttributeFormatter', { } else if (typeof value === 'boolean') { return value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no; } else if (value instanceof Date) { - 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); + } } return value; }, |