Improve email template

2024-11-21 21:57:56 +01:00 · 2022-04-11 15:09:42 -03:00 · 2022-04-11 15:09:42 -03:00 · 50e0069532
commit 50e0069532
parent b0517db79e
10 changed files with 48 additions and 30 deletions
--- 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) {
--- a/wise-webapp/src/main/resources/mail/baseLayout.vm
+++ b/wise-webapp/src/main/resources/mail/baseLayout.vm
@ -22,13 +22,13 @@
        </table>
    </div>
    <div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
-        Hi ${firstName}:
+        ${messages.getMessage("EMAIL.GREETINGS",$noArgs,$locale)} ${firstName}:
        <p>
            ${messageBody}
        </p>

-        <p style="color: #898989;">Regards,<br/>
-            The WiseMapping Team<br/>
+        <p style="color: #898989;">
+            <a href="http://www.wisemapping.com">The WiseMapping Team</a><br/>
        </p>
    </div>
 </div>
--- a/wise-webapp/src/main/resources/mail/confirmationMail.vm
+++ b/wise-webapp/src/main/resources/mail/confirmationMail.vm
@ -1,29 +1,29 @@
 <html>
 <body>
-<h3>Welcome to WiseMapping!</h3>
+<div>
+    <h3>Welcome to WiseMapping!</h3>

-<p>
+    <p>
        To active your account and verify your e-mail address, please click on the following link.
-</p>
-<a href="${emailcheck}">${emailcheck}</a>
-</p>
-<p>
+    </p>
+    <a href="${emailcheck}">${emailcheck}</a>
+    </p>
+    <p>
        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.
-</p>
+    </p>

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

-<p>
+    <p>
        For questions or concerns regarding your account, send us an email to support@wisemapping.com.
-</p>
+    </p>

-<p>
-    Cheers, <br/>
-    The WiseMapping Team.
-    <a href="http://www.wisemapping.com">WiseMapping Site</a>
-</p>
+    <p style="color: #898989;">
+        <a href="http://www.wisemapping.com">The WiseMapping Team</a><br/>
+    </p>
+<div>
 </body>
-        </html>
+</html>
--- a/wise-webapp/src/main/resources/mail/newCollaboration.vm
+++ b/wise-webapp/src/main/resources/mail/newCollaboration.vm
@ -33,6 +33,8 @@
    </div>
 </div>

-<p style="font-size: 13px;font-family: Arial, sans-serif">${doNotReplay}</p>
+<p style="color: #898989;">
+    <a href="http://www.wisemapping.com">The WiseMapping Team</a><br/>
+</p>
 </body>
 </html>
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@ -67,3 +67,4 @@ 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 <a href="mailto:{0}">hier</a>.
+EMAIL.GREETINGS=Hallo
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@ -68,3 +68,4 @@ PASSWORD_CHANGED.EMAIL_TITLE=Your password has been changed successfully
 PASSWORD_CHANGED.EMAIL_BODY=<p>This is only an notification that your password has been changed. No further action is required.</p>
 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 <a href="mailto:{0}">here</a>.
+EMAIL.GREETINGS=Hi
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@ -67,3 +67,4 @@ PASSWORD_CHANGED.EMAIL_TITLE=Su contraseña ha sido cambiada con éxito
 PASSWORD_CHANGED.EMAIL_BODY=<p>Esto es solo una notificación de que su contraseña ha sido cambiada. No se requiere ninguna otra acción.</p>
 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 <a href="mailto:{0}">aquí</a>.
+EMAIL.GREETINGS=Hola
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@ -67,3 +67,4 @@ 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 <a href="mailto:{0}">ici</a>.
+EMAIL.GREETINGS=Salut
--- 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=<p> Благодарим вас за интерес к WiseMapping. Нажмите <a href='https://app.wisemapping.com/c/login'>здесь</a>, чтобы начать создавать и публиковать новые интеллект-карты. Если у вас есть какие-либо отзывы или идеи, отправьте нам электронное письмо по адресу <a href=\"mailto:feedback@wisemapping.com\">feedback@wisemapping.com</a>. Мы будем рады услышать от вас.</p >
 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 <a href="mailto:{0}">here</a>.
+EMAIL.GREETINGS=Hi
--- 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=<p>这只是您的密码已更改的通知。无需进一步操作。</p>
 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 <a href="mailto:{0}">here</a>.
+EMAIL.GREETINGS=Hi