diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
| commit | 7fd1c08dd2f789ddd37ff075a6ebda1645947616 (patch) | |
| tree | 75b715e6dd70f6be3357e1710c4db6f1f6a1e29e /web/app/AttributeFormatter.js | |
| parent | 4606737cc07b736f9c8f98ae680b928c94c082c8 (diff) | |
| parent | 0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff) | |
| download | trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.gz trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.bz2 trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
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; }, |