aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-13 12:18:15 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-13 12:18:15 +1300
commit984feba192d0b347b99c550009ec6fd078728ca2 (patch)
tree6021b9a4b56866951a024b739732846d83235d2c /web
parent20d2bd13b0039e994ba9515d3d49e88079123470 (diff)
downloadtrackermap-server-984feba192d0b347b99c550009ec6fd078728ca2.tar.gz
trackermap-server-984feba192d0b347b99c550009ec6fd078728ca2.tar.bz2
trackermap-server-984feba192d0b347b99c550009ec6fd078728ca2.zip
Add twelve hour format preference
Diffstat (limited to 'web')
-rw-r--r--web/app/model/Server.js3
-rw-r--r--web/app/model/User.js3
-rw-r--r--web/app/view/ServerDialog.js5
-rw-r--r--web/app/view/UserDialog.js5
-rw-r--r--web/l10n/en.json1
5 files changed, 17 insertions, 0 deletions
diff --git a/web/app/model/Server.js b/web/app/model/Server.js
index 9b4b5b2b6..796ff58d6 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -54,6 +54,9 @@ Ext.define('Traccar.model.Server', {
}, {
name: 'zoom',
type: 'int'
+ }, {
+ name: 'twelveHourFormat',
+ type: 'boolean'
}],
proxy: {
diff --git a/web/app/model/User.js b/web/app/model/User.js
index b00918bc8..237a4d269 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -54,6 +54,9 @@ Ext.define('Traccar.model.User', {
}, {
name: 'zoom',
type: 'int'
+ }, {
+ name: 'twelveHourFormat',
+ type: 'boolean'
}],
proxy: {
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 9fbbed920..67f3a7ab2 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -79,6 +79,11 @@ Ext.define('Traccar.view.ServerDialog', {
xtype: 'numberfield',
name: 'zoom',
fieldLabel: Strings.serverZoom
+ }, {
+ xtype: 'checkboxfield',
+ name: 'twelveHourFormat',
+ fieldLabel: Strings.settingsTwelveHourFormat,
+ allowBlank: false
}]
}
});
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index c1ed2fece..d0e8bda52 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -84,6 +84,11 @@ Ext.define('Traccar.view.UserDialog', {
xtype: 'numberfield',
name: 'zoom',
fieldLabel: Strings.serverZoom
+ }, {
+ xtype: 'checkboxfield',
+ name: 'twelveHourFormat',
+ fieldLabel: Strings.settingsTwelveHourFormat,
+ allowBlank: false
}]
}
});
diff --git a/web/l10n/en.json b/web/l10n/en.json
index b0ea6ad26..4fb72c670 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -44,6 +44,7 @@
"settingsUsers": "Users",
"settingsDistanceUnit": "Distance",
"settingsSpeedUnit": "Speed",
+ "settingsTwelveHourFormat": "12-hour Format",
"reportTitle": "Reports",
"reportDevice": "Device",
"reportFrom": "From",