Merge remote-tracking branch 'ivanfmartinez/notifications'

# Conflicts:
#	src/org/traccar/Context.java

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index 524153721..ddc35227e 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -88,16 +88,16 @@ public final class NotificationFormatter {
         return template;
     }
 
-    public static MailMessage formatMailMessage(long userId, Event event, Position position) {
-        String templatePath = Context.getConfig().getString("mail.templatesPath", "mail");
+    public static MailMessage formatFullMessage(long userId, Event event, Position position) {
+        String templatePath = Context.getConfig().getString("message.full.templatesPath", "full");
         VelocityContext velocityContext = prepareContext(userId, event, position);
         String formattedMessage = formatMessage(velocityContext, userId, event, position, templatePath);
 
         return new MailMessage((String) velocityContext.get("subject"), formattedMessage);
     }
 
-    public static String formatSmsMessage(long userId, Event event, Position position) {
-        String templatePath = Context.getConfig().getString("sms.templatesPath", "sms");
+    public static String formatShortMessage(long userId, Event event, Position position) {
+        String templatePath = Context.getConfig().getString("message.short.templatesPath", "short");
 
         return formatMessage(null, userId, event, position, templatePath);
     }