From 19a9155d988dcee7698a65a45b0558aa0ff279d4 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 11 Apr 2018 14:31:42 +0500
Subject: Implement Maintenances

---
 web/l10n/en.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'web/l10n/en.json')

diff --git a/web/l10n/en.json b/web/l10n/en.json
index 1ebccbd..9b9a499 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -75,10 +75,10 @@
     "sharedNew": "New…",
     "sharedShowAddress": "Show Address",
     "sharedDisabled": "Disabled",
+    "sharedMaintenance": "Maintenance",
+    "sharedMaintenances": "Maintenances",
     "attributeSpeedLimit": "Speed Limit",
     "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
-    "attributeMaintenanceStart": "Maintenance: Start",
-    "attributeMaintenanceInterval": "Maintenance: Interval",
     "attributeWebReportColor": "Web: Report Color",
     "attributeDevicePassword": "Device Password",
     "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
@@ -103,6 +103,7 @@
     "attributeUiDisableDrivers": "UI: Disable Drivers",
     "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes",
     "attributeUiDisableCalendars": "UI: Disable Calendars",
+    "attributeUiDisableMaintenances": "UI: Disable Maintenances",
     "attributeUiHidePositionAttributes": "UI: Hide Position Attributes",
     "errorTitle": "Error",
     "errorGeneral": "Invalid parameters or constraints violation",
@@ -409,5 +410,7 @@
     "categoryShip": "Ship",
     "categoryTractor": "Tractor",
     "categoryTruck": "Truck",
-    "categoryVan": "Van"
+    "categoryVan": "Van",
+    "maintenanceStart": "Start",
+    "maintenancePeriod": "Period"
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 0ce5bc325c194acfb619d04db352fdba1b79d8b1 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 20 Apr 2018 08:54:04 +0500
Subject: Make string translatable

---
 web/app/view/dialog/Maintenance.js | 2 +-
 web/l10n/en.json                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/l10n/en.json')

diff --git a/web/app/view/dialog/Maintenance.js b/web/app/view/dialog/Maintenance.js
index e4be7b5..5705278 100644
--- a/web/app/view/dialog/Maintenance.js
+++ b/web/app/view/dialog/Maintenance.js
@@ -66,7 +66,7 @@ Ext.define('Traccar.view.dialog.Maintenance', {
                 allowBlank: false,
                 fieldLabel: Strings.maintenancePeriod,
                 validator: function (value) {
-                    return this.parseValue(value) !== 0 ? true : 'Can\'t be zero';
+                    return this.parseValue(value) !== 0 ? true : Strings.errorZero;
                 }
             }]
         }]
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 9b9a499..99c1381 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -109,6 +109,7 @@
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Connection error",
     "errorSocket": "Web socket connection error",
+    "errorZero": "Can't be zero",
     "userEmail": "Email",
     "userPassword": "Password",
     "userAdmin": "Admin",
-- 
cgit v1.2.3