Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added pre tag to fix the new lines in the email footer #6865

Merged
merged 2 commits into from
Aug 11, 2023
Merged

Added pre tag to fix the new lines in the email footer #6865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68c8c29
Added pre tag to fix the new lines in the email footer
Camelia-Orcid Aug 11, 2023
9deabc9
Merge branch 'main' into 794-prod-add-a-line-break-in-emails-footer
amontenegro Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions orcid-core/src/main/resources/i18n/email_common_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/i18n/email_common_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/i18n/email_common_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/i18n/email_common_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
5 changes: 3 additions & 2 deletions orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]).
</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>
Expand Down