diff options
author | ninioe <ninioe@gmail.com> | 2016-08-07 09:56:04 +0300 |
---|---|---|
committer | ninioe <ninioe@gmail.com> | 2016-08-07 09:56:04 +0300 |
commit | c1c5a5fd34402a4e9b0840a7b960c38371dd9748 (patch) | |
tree | 1c04413e2f2cc450c4be23ef459597b2b4e9f776 /src/org/traccar/notification/NotificationFormatter.java | |
parent | e26d81c7430d8668b3af1bbf15672f06a855d6d0 (diff) | |
parent | dea7617218de2cbc7ebd930b4342aa35ffedcd8b (diff) | |
download | trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.gz trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.bz2 trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.zip |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
# Conflicts:
# web/app/view/LoginController.js
Diffstat (limited to 'src/org/traccar/notification/NotificationFormatter.java')
-rw-r--r-- | src/org/traccar/notification/NotificationFormatter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java index 37bd7848c..449426df0 100644 --- a/src/org/traccar/notification/NotificationFormatter.java +++ b/src/org/traccar/notification/NotificationFormatter.java @@ -53,9 +53,9 @@ public final class NotificationFormatter { + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + "Time: %2$tc%n"; - public static final String TITLE_TEMPLATE_TYPE_DEVICE_OVERSPEED = "%1$s: exeeds the speed"; + public static final String TITLE_TEMPLATE_TYPE_DEVICE_OVERSPEED = "%1$s: exceeds the speed"; public static final String MESSAGE_TEMPLATE_TYPE_DEVICE_OVERSPEED = "Device: %1$s%n" - + "Exeeds the speed: %5$f%n" + + "Exceeds the speed: %5$f%n" + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + "Time: %2$tc%n"; |