- Make strings more laconic

- Make ArrayListFilter consistent

3 files changed, 6 insertions, 6 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index fe920395..d0b6713c 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 e8d1c130..519096eb 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 fbb7f019..e6a8a99f 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",