diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java index a2f184eb..1a7aaf6c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java @@ -73,6 +73,11 @@ final public class NotificationService { model.put("message", message); model.put("doNotReplay", messageSource.getMessage("EMAIL.DO_NOT_REPLAY", new Object[]{mailer.getSupportEmail()}, locale)); + // To resolve resources on templates ... + model.put("noArg", new Object[]{}); + model.put("messages", messageSource); + model.put("locale", locale); + mailer.sendEmail(formMail, collabEmail, subject, model, "newCollaboration.vm"); } catch (Exception e) { handleException(e); @@ -122,6 +127,11 @@ final public class NotificationService { model.put("supportEmail", mailer.getSupportEmail()); model.put("doNotReplay", messageSource.getMessage("EMAIL.DO_NOT_REPLAY", new Object[]{mailer.getSupportEmail()}, locale)); + // To resolve resources on templates ... + model.put("noArg", new Object[]{}); + model.put("messages", messageSource); + model.put("locale", locale); + logger.debug("Email properties->" + model); mailer.sendEmail(mailer.getServerSenderEmail(), user.getEmail(), mailSubject, model, "baseLayout.vm"); } catch (Exception e) { diff --git a/wise-webapp/src/main/resources/mail/baseLayout.vm b/wise-webapp/src/main/resources/mail/baseLayout.vm index fe0972b1..4ecadb87 100644 --- a/wise-webapp/src/main/resources/mail/baseLayout.vm +++ b/wise-webapp/src/main/resources/mail/baseLayout.vm @@ -22,13 +22,13 @@
- Hi ${firstName}: + ${messages.getMessage("EMAIL.GREETINGS",$noArgs,$locale)} ${firstName}:

${messageBody}

-

Regards,
- The WiseMapping Team
+

+ The WiseMapping Team

diff --git a/wise-webapp/src/main/resources/mail/confirmationMail.vm b/wise-webapp/src/main/resources/mail/confirmationMail.vm index 5d16c0a9..352cc1b0 100644 --- a/wise-webapp/src/main/resources/mail/confirmationMail.vm +++ b/wise-webapp/src/main/resources/mail/confirmationMail.vm @@ -1,29 +1,29 @@ -

Welcome to WiseMapping!

+
+

Welcome to WiseMapping!

-

- To active your account and verify your e-mail address, please click on the following link. -

-${emailcheck} -

-

- If you have received this mail by error, you do not need to take any action to cancel the account. The account will - not be activated, and you will not receive any further emails. -

+

+ To active your account and verify your e-mail address, please click on the following link. +

+ ${emailcheck} +

+

+ If you have received this mail by error, you do not need to take any action to cancel the account. The account will + not be activated, and you will not receive any further emails. +

-

- If clicking the link above does not work, copy and paste the URL in a new browser window instead. -

+

+ If clicking the link above does not work, copy and paste the URL in a new browser window instead. +

-

- For questions or concerns regarding your account, send us an email to support@wisemapping.com. -

+

+ For questions or concerns regarding your account, send us an email to support@wisemapping.com. +

-

- Cheers,
- The WiseMapping Team. - WiseMapping Site -

+

+ The WiseMapping Team
+

+
- \ No newline at end of file + \ No newline at end of file diff --git a/wise-webapp/src/main/resources/mail/newCollaboration.vm b/wise-webapp/src/main/resources/mail/newCollaboration.vm index b5c49b19..267957be 100755 --- a/wise-webapp/src/main/resources/mail/newCollaboration.vm +++ b/wise-webapp/src/main/resources/mail/newCollaboration.vm @@ -33,6 +33,8 @@
-

${doNotReplay}

+

+ The WiseMapping Team
+

\ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties index 1e729aae..1e9cd4f8 100644 --- a/wise-webapp/src/main/resources/messages_de.properties +++ b/wise-webapp/src/main/resources/messages_de.properties @@ -66,4 +66,5 @@ MINDMAP_EMPTY_ERROR=Mindmap darf nicht leer sein. INVALID_MINDMAP_FORMAT=Ungültiges Mindmap-Format. TOO_BIG_MINDMAP=Sie haben das Limit von 5000 Themen in einer Mindmap erreicht. SHARE_MAP.EMAIL_SUBJECT={0} hat eine Mindmap mit Ihnen geteilt -EMAIL.DO_NOT_REPLAY=Wichtig: Antworten Sie nicht auf diese E-Mail. Wenn Sie weitere Hilfe benötigen oder Bedenken bezüglich Ihres Kontos haben, kontaktieren Sie uns hier. \ No newline at end of file +EMAIL.DO_NOT_REPLAY=Wichtig: Antworten Sie nicht auf diese E-Mail. Wenn Sie weitere Hilfe benötigen oder Bedenken bezüglich Ihres Kontos haben, kontaktieren Sie uns hier. +EMAIL.GREETINGS=Hallo \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index a9c2f181..f28273c7 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -67,4 +67,5 @@ PASSWORD_CHANGED.EMAIL_SUBJECT=Your password has been changed PASSWORD_CHANGED.EMAIL_TITLE=Your password has been changed successfully PASSWORD_CHANGED.EMAIL_BODY=

This is only an notification that your password has been changed. No further action is required.

SHARE_MAP.EMAIL_SUBJECT={0} has shared a mind map with you -EMAIL.DO_NOT_REPLAY=Important: Do not reply this email. If you need further help or have any concerns regarding your account, contact us to here. \ No newline at end of file +EMAIL.DO_NOT_REPLAY=Important: Do not reply this email. If you need further help or have any concerns regarding your account, contact us to here. +EMAIL.GREETINGS=Hi \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 7ca5ace1..2bf83288 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -66,4 +66,5 @@ PASSWORD_CHANGED.EMAIL_SUBJECT=Su contraseña ha sido cambiada PASSWORD_CHANGED.EMAIL_TITLE=Su contraseña ha sido cambiada con éxito PASSWORD_CHANGED.EMAIL_BODY=

Esto es solo una notificación de que su contraseña ha sido cambiada. No se requiere ninguna otra acción.

SHARE_MAP.EMAIL_SUBJECT={0} te ha compartido un mapa mental -EMAIL.DO_NOT_REPLAY=Importante: No responda este correo electrónico. Si necesita más ayuda o tiene alguna inquietud con respecto a su cuenta, comuníquese con nosotros a aquí. \ No newline at end of file +EMAIL.DO_NOT_REPLAY=Importante: No responda este correo electrónico. Si necesita más ayuda o tiene alguna inquietud con respecto a su cuenta, comuníquese con nosotros a aquí. +EMAIL.GREETINGS=Hola \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties index b55fe419..a4c4be8c 100644 --- a/wise-webapp/src/main/resources/messages_fr.properties +++ b/wise-webapp/src/main/resources/messages_fr.properties @@ -66,4 +66,5 @@ MINDMAP_EMPTY_ERROR=La carte mentale ne peut pas être vide. INVALID_MINDMAP_FORMAT=Format de carte mentale non valide. TOO_BIG_MINDMAP=Vous avez atteint la limite de 5000 sujets dans une carte mentale. SHARE_MAP.EMAIL_SUBJECT={0} a partagé une carte mentale avec vous -EMAIL.DO_NOT_REPLAY=Important : Ne répondez pas à cet e-mail. Si vous avez besoin d'aide supplémentaire ou si vous avez des inquiétudes concernant votre compte, contactez-nous ici. \ No newline at end of file +EMAIL.DO_NOT_REPLAY=Important : Ne répondez pas à cet e-mail. Si vous avez besoin d'aide supplémentaire ou si vous avez des inquiétudes concernant votre compte, contactez-nous ici. +EMAIL.GREETINGS=Salut \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_ru.properties b/wise-webapp/src/main/resources/messages_ru.properties index 3caef0fd..1cb6340a 100644 --- a/wise-webapp/src/main/resources/messages_ru.properties +++ b/wise-webapp/src/main/resources/messages_ru.properties @@ -61,3 +61,4 @@ REGISTRATION.EMAIL_TITLE=Ваша учетная запись успешно с REGISTRATION.EMAIL_BODY=

Благодарим вас за интерес к WiseMapping. Нажмите здесь, чтобы начать создавать и публиковать новые интеллект-карты. Если у вас есть какие-либо отзывы или идеи, отправьте нам электронное письмо по адресу feedback@wisemapping.com. Мы будем рады услышать от вас.

SHARE_MAP.EMAIL_SUBJECT={0} has shared a mindmap with you EMAIL.DO_NOT_REPLAY=Important: Do not reply this email. If you need further help or have any concerns regarding your account, contact us to here. +EMAIL.GREETINGS=Hi \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_zh.properties b/wise-webapp/src/main/resources/messages_zh.properties index d8f323ef..c89b447c 100644 --- a/wise-webapp/src/main/resources/messages_zh.properties +++ b/wise-webapp/src/main/resources/messages_zh.properties @@ -67,3 +67,4 @@ PASSWORD_CHANGED.EMAIL_TITLE=你已经成功更改密码 PASSWORD_CHANGED.EMAIL_BODY=

这只是您的密码已更改的通知。无需进一步操作。

SHARE_MAP.EMAIL_SUBJECT={0} 与您分享了一张思维导图 EMAIL.DO_NOT_REPLAY=Important: Do not reply this email. If you need further help or have any concerns regarding your account, contact us to here. +EMAIL.GREETINGS=Hi \ No newline at end of file