diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-21 09:42:00 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 09:42:00 +1300 |
| commit | 0df9dc40451708f3f3904ba4c69a7e34ecc8e5be (patch) | |
| tree | 6b5c26041445dceb7b30df8ed214cdd3bbf3fd5f | |
| parent | 12fce5557a054dcbd2b63c3952d0e111e1c7fe02 (diff) | |
| parent | 90502b95e6904a05f00f3f3f14fca2d14789dbf2 (diff) | |
| download | trackermap-web-0df9dc40451708f3f3904ba4c69a7e34ecc8e5be.tar.gz trackermap-web-0df9dc40451708f3f3904ba4c69a7e34ecc8e5be.tar.bz2 trackermap-web-0df9dc40451708f3f3904ba4c69a7e34ecc8e5be.zip | |
Merge pull request #443 from Abyss777/text_message
Strings for text message Event and some Alarms
| -rw-r--r-- | web/app/controller/Root.js | 2 | ||||
| -rw-r--r-- | web/l10n/en.json | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 950b3348..b858b20c 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -214,6 +214,8 @@ Ext.define('Traccar.controller.Root', { } else if (array[i].type === 'alarm') { alarmKey = 'alarm' + array[i].attributes.alarm.charAt(0).toUpperCase() + array[i].attributes.alarm.slice(1); text = Strings[alarmKey] || alarmKey; + } else if (array[i].type === 'textMessage') { + text = Strings.eventTextMessage + ': ' + array[i].attributes.message; } else { text = Traccar.app.getEventString(array[i].type); } diff --git a/web/l10n/en.json b/web/l10n/en.json index 2826fc83..73ea0504 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -178,6 +178,7 @@ "eventIgnitionOn": "Ignition is ON", "eventIgnitionOff": "Ignition is OFF", "eventMaintenance": "Maintenance required", + "eventTextMessage": "Text message received", "alarm": "Alarm", "alarmSos": "SOS Alarm", "alarmVibration": "Vibration Alarm", @@ -186,6 +187,27 @@ "alarmFallDown": "FallDown Alarm", "alarmLowBattery": "LowBattery Alarm", "alarmFault": "Fault Alarm", + "alarmPowerOff": "Power Off Alarm", + "alarmPowerOn": "Power On Alarm", + "alarmDoor": "Door Alarm", + "alarmGeofence": "Geofence Alarm", + "alarmGeofenceEnter": "Geofence Enter Alarm", + "alarmGeofenceExit": "Geofence Exit Alarm", + "alarmGpsAntennaCut": "GPS Antenna Cut Alarm", + "alarmAccident": "Accident Alarm", + "alarmTow": "Tow Alarm", + "alarmHardAcceleration": "Hard Acceleration Alarm", + "alarmHardBreaking": "Hard Breaking Alarm", + "alarmFatigueDriving": "Fatigue Driving Alarm", + "alarmPowerCut": "Power Cut Alarm", + "alarmJamming": "Jamming Alarm", + "alarmTemperature": "Temperature Alarm", + "alarmParking": "Parking Alarm", + "alarmShock": "Shock Alarm", + "alarmBonnet": "Bonnet Alarm", + "alarmFootBrake": "Foot Brake Alarm", + "alarmOilLeak": "Oil Leak Alarm", + "alarmTampering": "Tampering Alarm", "notificationType": "Type of Notification", "notificationWeb": "Send via Web", "notificationMail": "Send via Mail", |