aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 12:38:57 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 12:38:57 +1300
commitd2f8ca9cb1dae87591de1b5e6037c78c15d23d2a (patch)
tree191c9e7e12ba6a86bc8d9912cc9001e8bc3599e9
parent0f6b2460a1d63f135731d22f15ecc33ee90bbef5 (diff)
downloadtrackermap-server-d2f8ca9cb1dae87591de1b5e6037c78c15d23d2a.tar.gz
trackermap-server-d2f8ca9cb1dae87591de1b5e6037c78c15d23d2a.tar.bz2
trackermap-server-d2f8ca9cb1dae87591de1b5e6037c78c15d23d2a.zip
Generate priorities for postion keys
-rw-r--r--web/app/view/Report.js2
-rw-r--r--web/app/view/StateController.js50
-rw-r--r--web/l10n/bg.js2
-rwxr-xr-xweb/l10n/cs.js2
-rw-r--r--web/l10n/de.js2
-rw-r--r--web/l10n/dk.js2
-rwxr-xr-xweb/l10n/el.js2
-rw-r--r--web/l10n/en.js2
-rw-r--r--web/l10n/es.js2
-rw-r--r--web/l10n/fr.js2
-rwxr-xr-xweb/l10n/hu.js2
-rw-r--r--web/l10n/lt.js2
-rw-r--r--web/l10n/nl.js2
-rw-r--r--web/l10n/pl.js2
-rw-r--r--web/l10n/pt.js2
-rw-r--r--web/l10n/ru.js2
-rwxr-xr-xweb/l10n/si.js2
-rw-r--r--web/l10n/sk.js2
-rw-r--r--web/l10n/sl.js2
-rw-r--r--web/l10n/sr.js2
-rw-r--r--web/l10n/th.js2
-rw-r--r--web/l10n/zh.js2
22 files changed, 34 insertions, 58 deletions
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 6f2359253..65a151c4d 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -84,7 +84,7 @@ Ext.define('Traccar.view.Report', {
flex: 1,
renderer: Traccar.AttributeFormatter.getFormatter('valid')
}, {
- text: Strings.positionTime,
+ text: Strings.positionFixTime,
dataIndex: 'fixTime',
flex: 1,
xtype: 'datecolumn',
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 98adb6b11..e2b80643d 100644
--- a/web/app/view/StateController.js
+++ b/web/app/view/StateController.js
@@ -35,44 +35,20 @@ Ext.define('Traccar.view.StateController', {
}
},
- keys: {
- fixTime: {
- priority: 1,
- name: Strings.positionTime
- },
- latitude: {
- priority: 2,
- name: Strings.positionLatitude
- },
- longitude: {
- priority: 3,
- name: Strings.positionLongitude
- },
- valid: {
- priority: 4,
- name: Strings.positionValid
- },
- altitude: {
- priority: 5,
- name: Strings.positionAltitude
- },
- speed: {
- priority: 6,
- name: Strings.positionSpeed
- },
- course: {
- priority: 7,
- name: Strings.positionCourse
- },
- address: {
- priority: 8,
- name: Strings.positionAddress
- },
- protocol: {
- priority: 9,
- name: Strings.positionProtocol
+ keys: (function () {
+ var i, list, result;
+ result = {};
+ list = ['fixTime', 'latitude', 'longitude', 'valid', 'altitude', 'speed', 'course', 'address', 'protocol'];
+ for (i = 0; i < list.length; i++) {
+ result[list[i]] = {
+ priority: i,
+ name: Strings['position' + list[i].replace(/^\w/g, function (s) {
+ return s.toUpperCase();
+ })]
+ };
}
- },
+ return result;
+ }()),
formatValue: function (value) {
if (typeof (id) === 'number') {
diff --git a/web/l10n/bg.js b/web/l10n/bg.js
index 8202ae35a..7bfec6a84 100644
--- a/web/l10n/bg.js
+++ b/web/l10n/bg.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Покажи',
reportClear: 'Изчисти',
- positionTime: 'Време',
+ positionFixTime: 'Време',
positionValid: 'Валидност',
positionLatitude: 'Географска Ширина',
positionLongitude: 'Географска Дължина',
diff --git a/web/l10n/cs.js b/web/l10n/cs.js
index 5d6c927e4..603b2368a 100755
--- a/web/l10n/cs.js
+++ b/web/l10n/cs.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Zobrazit',
reportClear: 'Vyčistit',
- positionTime: 'Čas',
+ positionFixTime: 'Čas',
positionValid: 'Správný',
positionLatitude: 'Šířka',
positionLongitude: 'Délka',
diff --git a/web/l10n/de.js b/web/l10n/de.js
index 0ababab34..6a8bc12ff 100644
--- a/web/l10n/de.js
+++ b/web/l10n/de.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Anzeigen',
reportClear: 'Leeren',
- positionTime: 'Zeit',
+ positionFixTime: 'Zeit',
positionValid: 'Gültig',
positionLatitude: 'Latitude',
positionLongitude: 'Longitude',
diff --git a/web/l10n/dk.js b/web/l10n/dk.js
index 831e5686f..9136bebdf 100644
--- a/web/l10n/dk.js
+++ b/web/l10n/dk.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Vis',
reportClear: 'Ryd',
- positionTime: 'Tid',
+ positionFixTime: 'Tid',
positionValid: 'Valid',
positionLatitude: '>Breddegrad',
positionLongitude: 'Længdegrad',
diff --git a/web/l10n/el.js b/web/l10n/el.js
index d2d6495b7..249871826 100755
--- a/web/l10n/el.js
+++ b/web/l10n/el.js
@@ -50,7 +50,7 @@
reportShow: 'Προβολή',
reportClear: 'Καθαρισμός',
- positionTime: 'Χρόνος',
+ positionFixTime: 'Χρόνος',
positionValid: 'Έγκυρο',
positionLatitude: 'Γ. πλάτος',
positionLongitude: 'Γ. μήκος',
diff --git a/web/l10n/en.js b/web/l10n/en.js
index cd6bf3038..23af1f81b 100644
--- a/web/l10n/en.js
+++ b/web/l10n/en.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Show',
reportClear: 'Clear',
- positionTime: 'Time',
+ positionFixTime: 'Time',
positionValid: 'Valid',
positionLatitude: 'Latitude',
positionLongitude: 'Longitude',
diff --git a/web/l10n/es.js b/web/l10n/es.js
index ff5fbb7ab..9e96dd368 100644
--- a/web/l10n/es.js
+++ b/web/l10n/es.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Mostrar',
reportClear: 'Limpiar',
- positionTime: 'Hora',
+ positionFixTime: 'Hora',
positionValid: 'Valida',
positionLatitude: 'Latitud',
positionLongitude: 'Longitud',
diff --git a/web/l10n/fr.js b/web/l10n/fr.js
index 7d1541c22..c91d7574f 100644
--- a/web/l10n/fr.js
+++ b/web/l10n/fr.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Afficher',
reportClear: 'Effacer',
- positionTime: 'Heure',
+ positionFixTime: 'Heure',
positionValid: 'Valide',
positionLatitude: 'Latitude',
positionLongitude: 'Longitude',
diff --git a/web/l10n/hu.js b/web/l10n/hu.js
index b8d965e4a..44a02562d 100755
--- a/web/l10n/hu.js
+++ b/web/l10n/hu.js
@@ -50,7 +50,7 @@ var strings = {
reportShow: 'Mutat',
reportClear: 'Töröl',
- positionTime: 'Idő',
+ positionFixTime: 'Idő',
positionValid: 'Valós',
positionLatitude: 'Szélességi fok',
positionLongitude: 'Hosszúsági fok',
diff --git a/web/l10n/lt.js b/web/l10n/lt.js
index 1ff138d65..8bedf2ac6 100644
--- a/web/l10n/lt.js
+++ b/web/l10n/lt.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Rodyti',
reportClear: 'Valyti',
- positionTime: 'Laikas',
+ positionFixTime: 'Laikas',
positionValid: 'Galimas',
positionLatitude: 'Platuma',
positionLongitude: 'Ilguma',
diff --git a/web/l10n/nl.js b/web/l10n/nl.js
index b51040068..ee9d2c367 100644
--- a/web/l10n/nl.js
+++ b/web/l10n/nl.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Laten zien',
reportClear: 'Leegmaken',
- positionTime: 'Tijd',
+ positionFixTime: 'Tijd',
positionValid: 'Geldig',
positionLatitude: 'Latitude',
positionLongitude: 'Longitude',
diff --git a/web/l10n/pl.js b/web/l10n/pl.js
index 238dd33bf..ec50bbdb5 100644
--- a/web/l10n/pl.js
+++ b/web/l10n/pl.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Wczytaj',
reportClear: 'Wyczyść',
- positionTime: 'Czas',
+ positionFixTime: 'Czas',
positionValid: 'Aktywny',
positionLatitude: 'Szerokość',
positionLongitude: 'Długość',
diff --git a/web/l10n/pt.js b/web/l10n/pt.js
index 6155b2312..aaf613adc 100644
--- a/web/l10n/pt.js
+++ b/web/l10n/pt.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Mostrar',
reportClear: 'Limpar',
- positionTime: 'Tempo',
+ positionFixTime: 'Tempo',
positionValid: 'Válido',
positionLatitude: 'Latitude',
positionLongitude: 'Longitude',
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
index ea98d31ff..4536a1082 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Показать',
reportClear: 'Очистить',
- positionTime: 'Время',
+ positionFixTime: 'Время',
positionValid: 'Корректность',
positionLatitude: 'Широта',
positionLongitude: 'Долгота',
diff --git a/web/l10n/si.js b/web/l10n/si.js
index 649b81f4c..c3d4dc679 100755
--- a/web/l10n/si.js
+++ b/web/l10n/si.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'පෙන්වන්න',
reportClear: 'ඉවත් කරන්න',
- positionTime: 'කාලය',
+ positionFixTime: 'කාලය',
positionValid: 'වලංගු',
positionLatitude: 'අක්ෂාංශ',
positionLongitude: 'දේශාංශ',
diff --git a/web/l10n/sk.js b/web/l10n/sk.js
index 98d131b65..e54a491ee 100644
--- a/web/l10n/sk.js
+++ b/web/l10n/sk.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Zobraziť',
reportClear: 'Vyčistiť',
- positionTime: 'Čas',
+ positionFixTime: 'Čas',
positionValid: 'Platný',
positionLatitude: 'Šírka',
positionLongitude: 'Dĺžka',
diff --git a/web/l10n/sl.js b/web/l10n/sl.js
index df8c8ab18..4819b03a4 100644
--- a/web/l10n/sl.js
+++ b/web/l10n/sl.js
@@ -50,7 +50,7 @@ var strings = {
reportShow: 'Prikaži',
reportClear: 'Očisti',
- positionTime: 'Čas',
+ positionFixTime: 'Čas',
positionValid: 'Veljavnost',
positionLatitude: 'Širina',
positionLongitude: 'Dolžina',
diff --git a/web/l10n/sr.js b/web/l10n/sr.js
index 3c1588401..d4975a339 100644
--- a/web/l10n/sr.js
+++ b/web/l10n/sr.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'Prikaži',
reportClear: 'Izbriši',
- positionTime: 'Vreme',
+ positionFixTime: 'Vreme',
positionValid: 'Ispravno',
positionLatitude: 'Geografska širina',
positionLongitude: 'Geografska dužina',
diff --git a/web/l10n/th.js b/web/l10n/th.js
index bc0129353..c4c32c2e1 100644
--- a/web/l10n/th.js
+++ b/web/l10n/th.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: 'แสดง',
reportClear: 'ขจัด',
- positionTime: 'เวลา',
+ positionFixTime: 'เวลา',
positionValid: 'ถูกต้อง',
positionLatitude: 'ละติจูด',
positionLongitude: 'ลองจิจูด',
diff --git a/web/l10n/zh.js b/web/l10n/zh.js
index 01c6bec47..1b16967ac 100644
--- a/web/l10n/zh.js
+++ b/web/l10n/zh.js
@@ -50,7 +50,7 @@ var Strings = {
reportShow: '显示',
reportClear: '清空',
- positionTime: '时间',
+ positionFixTime: '时间',
positionValid: '有效',
positionLatitude: '纬度',
positionLongitude: '经度',