Merge branch 'main' into dependabot/maven/orcid-core/org.codehaus.jet…

…tison-jettison-1.5.4
ORCID · Aug 15, 2023 · 9f2bde8 · 9f2bde8
2 parents 62f8bb2 + 9a8ebd0
commit 9f2bde8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## v2.37.11 - 2023-08-15
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.10...v2.37.11)
+
+- [#6869](https://github.com/ORCID/ORCID-Source/pull/6869): fix: Remove duplicated email in claim reminder email
+
+### Fix
+
+- Remove duplicated email in claim reminder email
+
 ## v2.37.10 - 2023-08-11
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.37.9...v2.37.10)

diff --git a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email.ftl
@@ -23,4 +23,8 @@ ${verificationUrl}?lang=${locale}
 ${baseUri}/home?lang=${locale}
 
 <@emailMacros.msg "email.api_record_creation.you_have_received.1" />${baseUri}/home?lang=${locale}S<@emailMacros.msg "email.api_record_creation.you_have_received.2" />
-<#include "email_footer.ftl"/>
+<@emailMacros.msg "email.common.email.preferences" /> (${baseUri}/account)
+<@emailMacros.msg "email.common.privacy_policy" /> (${baseUri}/privacy-policy)
+<@emailMacros.msg "email.common.address1" />
+
+<@emailMacros.msg "email.common.address2" />
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/claim_reminder_email_html.ftl
@@ -46,7 +46,12 @@
 				<@emailMacros.msg "email.common.you_have_received_this_email" />
 			</p>
 			<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
-			   <#include "email_footer_html.ftl"/>
+				<small>
+					<a href="${baseUri}/account" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.email.preferences" /></a>
+					| <a href="${baseUri}/privacy-policy" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.privacy_policy" /></a>
+					| <@emailMacros.msg "email.common.address1" /><@emailMacros.space />|<@emailMacros.space /><@emailMacros.msg "email.common.address2" />
+					| <a href="${baseUri}" target="_blank" style="color: #2E7F9F;">ORCID.org</a>
+				</small>
 			</p>
 		 </div>
 	 </body>

diff --git a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email.ftl
@@ -23,4 +23,8 @@ ${verificationUrl}?lang=${locale}
 ${baseUri}/home?lang=${locale}
 
 <@emailMacros.msg "email.api_record_creation.you_have_received.1" />${baseUri}/home?lang=${locale}S<@emailMacros.msg "email.api_record_creation.you_have_received.2" />
-<#include "email_footer.ftl"/>
+<@emailMacros.msg "email.common.email.preferences" /> (${baseUri}/account)
+<@emailMacros.msg "email.common.privacy_policy" /> (${baseUri}/privacy-policy)
+<@emailMacros.msg "email.common.address1" />
+
+<@emailMacros.msg "email.common.address2" />
diff --git a/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/new_claim_reminder_email_html.ftl
@@ -44,7 +44,12 @@
 				<@emailMacros.msg "email.common.you_have_received_this_email" />
 			</p>
 			<p style="font-family: arial,  helvetica, sans-serif;font-size: 15px;color: #494A4C;">
-			   <#include "email_footer_html.ftl"/>
+				<small>
+					<a href="${baseUri}/account" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.email.preferences" /></a>
+					| <a href="${baseUri}/privacy-policy" target="_blank" style="color: #2E7F9F;"><@emailMacros.msg "email.common.privacy_policy" /></a>
+					| <@emailMacros.msg "email.common.address1" /><@emailMacros.space />|<@emailMacros.space /><@emailMacros.msg "email.common.address2" />
+					| <a href="${baseUri}" target="_blank" style="color: #2E7F9F;">ORCID.org</a>
+				</small>
 			</p>
 		 </div>
 	 </body>