diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-06 21:08:31 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 21:08:31 +1200 |
| commit | f0578c7b5f8737e019a9cf05935d2caaa940f0ca (patch) | |
| tree | 778b00dd1a6162007cb08239d475884843a678ba /src/org/traccar/notification | |
| parent | 3e5167131c758dd6e75e0f5d9b265a1514baac0c (diff) | |
| parent | fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25 (diff) | |
| download | traccar-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.tar.gz traccar-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.tar.bz2 traccar-server-f0578c7b5f8737e019a9cf05935d2caaa940f0ca.zip | |
Merge pull request #3507 from Abyss777/units_attributes
Move units to attributes and add volume units
Diffstat (limited to 'src/org/traccar/notification')
| -rw-r--r-- | src/org/traccar/notification/NotificationFormatter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java index 33fd2cdc7..8da819430 100644 --- a/src/org/traccar/notification/NotificationFormatter.java +++ b/src/org/traccar/notification/NotificationFormatter.java @@ -48,7 +48,9 @@ public final class NotificationFormatter { velocityContext.put("event", event); if (position != null) { velocityContext.put("position", position); - velocityContext.put("speedUnits", ReportUtils.getSpeedUnit(userId)); + velocityContext.put("speedUnit", ReportUtils.getSpeedUnit(userId)); + velocityContext.put("distanceUnit", ReportUtils.getDistanceUnit(userId)); + velocityContext.put("volumeUnit", ReportUtils.getVolumeUnit(userId)); } if (event.getGeofenceId() != 0) { velocityContext.put("geofence", Context.getGeofenceManager().getById(event.getGeofenceId())); |