From 17157262fef1c046d116b2270f4e1d335fe9da1b Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 26 Jun 2018 12:00:15 +0500
Subject: Implement refactored notifications

---
 web/app/Application.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'web/app/Application.js')

diff --git a/web/app/Application.js b/web/app/Application.js
index cef03d5..fe92039 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -108,7 +108,8 @@ Ext.define('Traccar.Application', {
         'Maintenances',
         'AllMaintenances',
         'MaintenanceTypes',
-        'HoursUnits'
+        'HoursUnits',
+        'AllNotificators'
     ],
 
     controllers: [
@@ -128,6 +129,11 @@ Ext.define('Traccar.Application', {
         return Strings[key] || key;
     },
 
+    getNotificatorString: function (eventType) {
+        var key = 'notification' + eventType.charAt(0).toUpperCase() + eventType.slice(1);
+        return Strings[key] || key;
+    },
+
     showReports: function (show) {
         var rootPanel = Ext.getCmp('rootPanel');
         if (rootPanel) {
-- 
cgit v1.2.3


From 8e69514733aace4690a9e80a6dd5158d625a66e2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 28 Jun 2018 10:02:41 +0500
Subject: - Make strings more laconic - Make ArrayListFilter consistent

---
 web/app/Application.js          | 2 +-
 web/app/view/ArrayListFilter.js | 2 +-
 web/l10n/en.json                | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'web/app/Application.js')

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",
-- 
cgit v1.2.3