aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-06-28 10:02:41 +0500
committerAbyss777 <abyss@fox5.ru>2018-06-28 10:02:41 +0500
commit8e69514733aace4690a9e80a6dd5158d625a66e2 (patch)
treeb22c3a7f6acbc2bc28eafdae69f066cbd1ad9649
parentdf0ad229b96a036aaf98bcb8315d69d1bdb7367a (diff)
downloadetbsa-traccar-web-8e69514733aace4690a9e80a6dd5158d625a66e2.tar.gz
etbsa-traccar-web-8e69514733aace4690a9e80a6dd5158d625a66e2.tar.bz2
etbsa-traccar-web-8e69514733aace4690a9e80a6dd5158d625a66e2.zip
- Make strings more laconic
- Make ArrayListFilter consistent
-rw-r--r--web/app/Application.js2
-rw-r--r--web/app/view/ArrayListFilter.js2
-rw-r--r--web/l10n/en.json8
3 files changed, 6 insertions, 6 deletions
diff --git a/web/app/Application.js b/web/app/Application.js
index fe92039..d0b6713 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -130,7 +130,7 @@ Ext.define('Traccar.Application', {
},
getNotificatorString: function (eventType) {
- var key = 'notification' + eventType.charAt(0).toUpperCase() + eventType.slice(1);
+ var key = 'notificator' + eventType.charAt(0).toUpperCase() + eventType.slice(1);
return Strings[key] || key;
},
diff --git a/web/app/view/ArrayListFilter.js b/web/app/view/ArrayListFilter.js
index e8d1c13..519096e 100644
--- a/web/app/view/ArrayListFilter.js
+++ b/web/app/view/ArrayListFilter.js
@@ -34,7 +34,7 @@ Ext.define('Traccar.view.ArrayListFilter', {
return true;
}
}
- } else if (property.indexOf(',') !== -1) {
+ } else if (property.match(/[ ,]+/)) {
splits = property.split(/[ ,]+/).filter(Boolean);
for (i = 0; i < splits.length; i++) {
if (value.indexOf(splits[i]) !== -1) {
diff --git a/web/l10n/en.json b/web/l10n/en.json
index fbb7f01..e6a8a99 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -356,10 +356,10 @@
"alarmRemoving": "Removing Alarm",
"notificationType": "Type of Notification",
"notificationAlways": "All Devices",
- "notificationWeb": "Send via Web",
- "notificationMail": "Send via Mail",
- "notificationSms": "Send via SMS",
- "notificationNotificators": "Way of Notification",
+ "notificationNotificators": "Channels",
+ "notificatorWeb": "Web",
+ "notificatorMail": "Mail",
+ "notificatorSms": "SMS",
"reportRoute": "Route",
"reportEvents": "Events",
"reportTrips": "Trips",