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 /web/app/controller/Root.js | |
| 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
Diffstat (limited to 'web/app/controller/Root.js')
| -rw-r--r-- | web/app/controller/Root.js | 2 |
1 files changed, 2 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); } |