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 9845b901..dfc23caa 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java @@ -111,6 +111,7 @@ final public class NotificationService { } private void sendTemplateMail(@NotNull User user, @NotNull String mailSubject, @NotNull String messageTitle, @NotNull String messageBody) { + final Locale locale = LocaleContextHolder.getLocale(); try { final Map model = new HashMap<>(); @@ -119,6 +120,7 @@ final public class NotificationService { model.put("messageBody", messageBody); model.put("baseUrl", getBaseUrl()); model.put("supportEmail", mailer.getSupportEmail()); + model.put("doNotReplay", messageSource.getMessage("EMAIL.DO_NOT_REPLAY", new Object[]{mailer.getSupportEmail()}, locale)); logger.debug("Email properties->" + model); mailer.sendEmail(mailer.getServerSenderEmail(), user.getEmail(), mailSubject, model, "baseLayout.vm"); diff --git a/wise-webapp/src/main/resources/mail/baseLayout.vm b/wise-webapp/src/main/resources/mail/baseLayout.vm index 85de626f..d9fe9547 100644 --- a/wise-webapp/src/main/resources/mail/baseLayout.vm +++ b/wise-webapp/src/main/resources/mail/baseLayout.vm @@ -33,9 +33,5 @@ -

Important: Do not reply this email. If - you need further help or believe you have received this email in error, contact us to here. -

- +

${doNotReplay}

\ 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 cc52099a..98a57c33 100755 --- a/wise-webapp/src/main/resources/mail/newCollaboration.vm +++ b/wise-webapp/src/main/resources/mail/newCollaboration.vm @@ -33,8 +33,6 @@ -

Important: Do not reply this email. If - you need further help or have any concerns regarding your account, contact us to here. -

+

${doNot}

\ 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 1ea2cf48..1e729aae 100644 --- a/wise-webapp/src/main/resources/messages_de.properties +++ b/wise-webapp/src/main/resources/messages_de.properties @@ -66,3 +66,4 @@ 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 diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index fb31e8a4..a9c2f181 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -67,3 +67,4 @@ 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 diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 7802504f..97e871db 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -55,7 +55,7 @@ CAPTCHA_TIMEOUT_OUT_DUPLICATE=Por favor, actualice la página y vuelva a intenta CAPTCHA_INVALID_INPUT_RESPONSE=Respuesta ingresada no es válida, actualice la página y vuelva a intentarlo. MINDMAP_EMPTY_ERROR=El mapa mental no puede estar vacío. INVALID_MINDMAP_FORMAT=Formato de mapa mental no válido. -TOO_BIG_MINDMAP=Ha alcanzado el límite de 5000 temas en un mapa mental. +TOO_BIG_MINDMAP=Ha alcanzado el límite de 5000 nodos en un mapa mental. REGISTRATION.EMAIL_SUBJECT=Bienvenido/a a WiseMapping ! REGISTRATION.EMAIL_TITLE=Tu cuenta ha sido creada exitosamente REGISTRATION.EMAIL_BODY=

Gracias por tu interest en WiseMapping. Hace click aqui para empezar a crear y compatir tus mapas mentales. Ideas y sugerencias, no dudes en contactarnos a feedback@wisemapping.com.

@@ -66,3 +66,4 @@ 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 diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties index bf56770e..b55fe419 100644 --- a/wise-webapp/src/main/resources/messages_fr.properties +++ b/wise-webapp/src/main/resources/messages_fr.properties @@ -66,3 +66,4 @@ 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 diff --git a/wise-webapp/src/main/resources/messages_ru.properties b/wise-webapp/src/main/resources/messages_ru.properties index 0d29b9e2..3caef0fd 100644 --- a/wise-webapp/src/main/resources/messages_ru.properties +++ b/wise-webapp/src/main/resources/messages_ru.properties @@ -60,4 +60,4 @@ REGISTRATION.EMAIL_SUBJECT=Добро пожаловать в WiseMapping! 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. diff --git a/wise-webapp/src/main/resources/messages_zh.properties b/wise-webapp/src/main/resources/messages_zh.properties index b6509a07..d8f323ef 100644 --- a/wise-webapp/src/main/resources/messages_zh.properties +++ b/wise-webapp/src/main/resources/messages_zh.properties @@ -66,4 +66,4 @@ PASSWORD_CHANGED.EMAIL_SUBJECT=您的密码已被更改 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.