From 68c8c296e054e32c3b95f54b6435f4ce2b122c67 Mon Sep 17 00:00:00 2001
From: "c.dumitru@orcid.org" <c.dumitru@orcid.org>
Date: Fri, 11 Aug 2023 13:12:19 +0100
Subject: [PATCH] Added pre tag to fix the new lines in the email footer

---
 .../src/main/resources/i18n/email_common_en.properties      | 3 +--
 .../src/main/resources/i18n/email_common_es.properties      | 2 +-
 .../src/main/resources/i18n/email_common_it.properties      | 2 +-
 .../src/main/resources/i18n/email_common_pt.properties      | 2 +-
 .../resources/org/orcid/core/template/email_footer_html.ftl | 6 ++++--
 .../orcid/core/manager/example_verification_email_body.html | 5 +++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/orcid-core/src/main/resources/i18n/email_common_en.properties b/orcid-core/src/main/resources/i18n/email_common_en.properties
index 83c2cae7fb8..d4b9aab8226 100644
--- a/orcid-core/src/main/resources/i18n/email_common_en.properties
+++ b/orcid-core/src/main/resources/i18n/email_common_en.properties
@@ -16,8 +16,7 @@ email.common.if_you_have_any2=.\n
 
 email.common.period=.
 
-email.common.warm_regards=Warm Regards,\n\
-                          The ORCID Team\n
+email.common.warm_regards=Warm Regards,\nThe ORCID Team\n
 
 
 email.common.warm_regards.simple=Warm Regards,\n\The ORCID Team \n\
diff --git a/orcid-core/src/main/resources/i18n/email_common_es.properties b/orcid-core/src/main/resources/i18n/email_common_es.properties
index bbb5f750968..07b6312d82d 100644
--- a/orcid-core/src/main/resources/i18n/email_common_es.properties
+++ b/orcid-core/src/main/resources/i18n/email_common_es.properties
@@ -14,7 +14,7 @@ email.common.if_you_have_any2=.
 
 email.common.period=.
 
-email.common.warm_regards=Saludos cordiales,\nEl equipo de ORCID
+email.common.warm_regards=Saludos cordiales,\nEl equipo de ORCID\n
 
 
 email.common.warm_regards.simple=Atentamente,\n\El equipo de ORCID
diff --git a/orcid-core/src/main/resources/i18n/email_common_it.properties b/orcid-core/src/main/resources/i18n/email_common_it.properties
index 66b081bc865..8ee82ef0e84 100644
--- a/orcid-core/src/main/resources/i18n/email_common_it.properties
+++ b/orcid-core/src/main/resources/i18n/email_common_it.properties
@@ -14,7 +14,7 @@ email.common.if_you_have_any2=.
 
 email.common.period=.
 
-email.common.warm_regards=Cordiali saluti,\nIl team ORCID
+email.common.warm_regards=Cordiali saluti,\nIl team ORCID\n
 
 
 email.common.warm_regards.simple=Cordiali saluti,\n\Il team ORCID
diff --git a/orcid-core/src/main/resources/i18n/email_common_pt.properties b/orcid-core/src/main/resources/i18n/email_common_pt.properties
index 39a3425529e..2062b9b785a 100644
--- a/orcid-core/src/main/resources/i18n/email_common_pt.properties
+++ b/orcid-core/src/main/resources/i18n/email_common_pt.properties
@@ -14,7 +14,7 @@ email.common.if_you_have_any2=.
 
 email.common.period=.\n
 
-email.common.warm_regards=Com os melhores cumprimentos,\nA Equipa ORCID
+email.common.warm_regards=Com os melhores cumprimentos,\nA Equipa ORCID\n
 
 
 email.common.warm_regards.simple=Com os melhores cumprimentos,\n\A Equipa ORCID
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl
index 5c0e316f8a9..71f8bc199ca 100644
--- a/orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl
+++ b/orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl
@@ -1,7 +1,9 @@
 <#escape x as x?html>
-<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
-<@emailMacros.msg "email.common.warm_regards" /></br>
+<p>
+<pre style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
+<@emailMacros.msg "email.common.warm_regards" />
 <a href="https://support.orcid.org/hc/en-us" target="_blank" style="color: #2E7F9F;">https://support.orcid.org</a>
+</pre>
 </p>
 <p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
 <@emailMacros.msg "email.common.received_email_as_service" />
diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html
index 45b02b8e5ea..2938620f539 100644
--- a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html
+++ b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html
@@ -58,11 +58,12 @@
 		    <p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
 		    	Your 16-digit ORCID identifier is 4444-4444-4444-4446, and your full ORCID iD and the link to your public record is <a href="https://testserver.orcid.org/4444-4444-4444-4446?lang=en" target="orcid.blank">https://testserver.orcid.org/4444-4444-4444-4446</a> (primary email address: josiah_carberry@brown.edu).
 		    </p>
-<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
+<p>
+<pre style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
 Warm Regards,
 The ORCID Team
-</br>
 <a href="https://support.orcid.org/hc/en-us" target="_blank" style="color: #2E7F9F;">https://support.orcid.org</a>
+</pre>
 </p>
 <p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
 You have received this email as a service announcement related to your ORCID Account.</p>