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

Jump to bottom

8734 update the registry emails to remove links to the support team emails and forms #6838

Merged
merged 4 commits into from
Jul 31, 2023
Merged

8734 update the registry emails to remove links to the support team emails and forms #6838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d43f33d
fix: Rollback loced orcid email
DanielPalafox Jul 30, 2023
69815d8
fix: Fix typos and add missing paragraphs
DanielPalafox Jul 30, 2023
38a6af8
fix: Remove empty white space
DanielPalafox Jul 30, 2023
f4c2ad9
Fix unit test
amontenegro Jul 31, 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: 2 additions & 1 deletion orcid-core/src/main/resources/i18n/email_deactivate_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ email.deactivate.you_have_requested.2=Please click on the following link to comp
email.deactivate.gdpr_if_you_do_not=If you do not want to deactivate your account, then do not click on the link, and your account will remain active.
email.deactivate.please_note.1=Please note that, after your account is deactivated, your ORCID iD will continue to be stored in our database. All other data will be deleted from your record, except for your email address, which will be stored separately in a private
email.deactivate.please_note.2=hashed
email.deactivate.please_note.3=file that is not in the Registry. We keep this information to ensure that we don't assign the same identifier to another person. You can reactivate your ORCID iD at any time by entering your email address on the ORCID registration form.
email.deactivate.please_note.3=file that is not in the Registry and, in line with requirements set out by GDPR. We keep this information to ensure that we don't assign the same identifier to another person.
email.deactivate.more_info=For more information on deactivating your account, please see:
email.deactivate.if_you_did=If you did not request account deactivation, please contact ORCID Support at
email.deactivate.gdpr_or_by_replying=or by replying to this email.
email.deactivate.reactivate_anytime=You can reactivate your ORCID iD at any time by entering your email address on the ORCID registration form. For more information on deactivating your account, please see:
8 changes: 1 addition & 7 deletions orcid-core/src/main/resources/i18n/email_locked_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#locked_orcid_email.ftl
#################################################
## Used on:
## Used on:
# locked_orcid_email


Expand All @@ -22,9 +22,3 @@ email.locked.if_you_believe=If you believe your record was locked in error pleas

email.locked.if_you_believe_html=If you believe your record was locked in error please contact us at\n\
<a href="https://support.orcid.org/hc/en-us/requests/new">https://support.orcid.org/hc/en-us/requests/new</a> so that we can review your information and reactivate your record.\n

email.locked.orcid_registry_provides_identifiers=The ORCID Registry provides identifiers for individual researchers.\n\
Registrations and records for business, organizations, and advertising content are not allowed.
email.locked.please_see=Please see our
email.locked.terms_of_use=terms of use
email.locked.further_information=for further information.
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/i18n/email_welcome_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ email.welcome.thank_you_for_creating=Thank you for creating your ORCID identifie
email.welcome.full_orcid_and_link_public=, and your full ORCID iD and the link to your public record is
email.welcome.please_verify_your_email=Please verify your email address to complete your registration and gain access to manually edit your record: click the following link and sign into your ORCID record. If you can't click the link, copy and paste it into your browser's address bar.
email.welcome.please_visit_your=Please visit our
email.welcome.researcher_home_page=researcher home page
email.welcome.researcher_homepage=researcher homepage
email.welcome.for_more_information=for more information on how to get the most out of your ORCID record.
2 changes: 2 additions & 0 deletions orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ ${baseUri}${deactivateUrlEndpoint}?lang=${locale}

<@emailMacros.msg "email.deactivate.please_note.1" /> <@emailMacros.msg "email.deactivate.please_note.2" /> (https://en.wikipedia.org/wiki/Cryptographic_hash_function) <@emailMacros.msg "email.deactivate.please_note.3" />

<@emailMacros.msg "email.deactivate.reactivate_anytime" /> <a href="https://support.orcid.org/hc/articles/360006973813" rel="noopener noreferrer" target="_blank">https://support.orcid.org/hc/articles/360006973813</a>

<#include "email_footer.ftl"/>
3 changes: 3 additions & 0 deletions orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.deactivate.please_note.1" /> <a href="https://en.wikipedia.org/wiki/Cryptographic_hash_function" rel="noopener noreferrer" target="_blank"><@emailMacros.msg "email.deactivate.please_note.2" /></a> <@emailMacros.msg "email.deactivate.please_note.3" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.deactivate.reactivate_anytime" /> <a href="https://support.orcid.org/hc/articles/360006973813" rel="noopener noreferrer" target="_blank">https://support.orcid.org/hc/articles/360006973813</a>
</p>
<#include "email_footer_html.ftl"/>
</div>
</body>
Expand Down
4 changes: 2 additions & 2 deletions orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<#import "email_macros.ftl" as emailMacros />

<@emailMacros.msg "email.email_removed.the_primary" />
<@emailMacros.msg "email.email_removed.the_primary" />

<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space />${baseUri}/${orcid}<@emailMacros.msg "email.email_removed.while.2" />
<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space /><a href="${baseUri}/${orcid}">${baseUri}/${orcid}</a><@emailMacros.msg "email.email_removed.while.2" />

<#include "email_footer.ftl"/>
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<@emailMacros.msg "email.email_removed.the_primary" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space /><a href="">${baseUri}/${orcid}</a><@emailMacros.msg "email.email_removed.while.2" />
<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space /><a href="${baseUri}/${orcid}">${baseUri}/${orcid}</a><@emailMacros.msg "email.email_removed.while.2" />
</p>
<#include "email_footer_html.ftl"/>
</div>
Expand Down
13 changes: 11 additions & 2 deletions orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@
<@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}<@emailMacros.msg "email.common.dear.comma" />

<#if features["HTTPS_IDS"]?? && features["HTTPS_IDS"]>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" />${baseUri}/${orcid}?lang=${locale}<@emailMacros.msg "email.locked.this_is_an_important_message.2" />
<@emailMacros.msg "email.locked.this_is_an_important_message.1" />${baseUri}/${orcid}?lang=${locale}<@emailMacros.msg "email.locked.this_is_an_important_message.2" />
<#else>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" />${baseUriHttp}/${orcid}?lang=${locale}<@emailMacros.msg "email.locked.this_is_an_important_message.2" />
</#if>

<@emailMacros.msg "email.locked.orcid_registry_provides_identifiers" /><@emailMacros.space /><@emailMacros.msg "email.locked.please_see" /><@emailMacros.space /><a href="https://info.orcid.org/terms-of-use/"><@emailMacros.msg "email.locked.terms_of_use" /></a><@emailMacros.space /><@emailMacros.msg "email.locked.further_information" />
<@emailMacros.msg "email.locked.the_orcid_registry_provides" />

<@emailMacros.msg "email.locked.if_you_believe" />

<@emailMacros.msg "email.common.warm_regards" />
<@emailMacros.msg "email.common.need_help.description.2.href" />


${baseUri}/home?lang=${locale}

<@emailMacros.msg "email.common.you_have_received_this_email" />
<#include "email_footer.ftl"/>
50 changes: 34 additions & 16 deletions orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email_html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,37 @@
<body>
<div style="padding: 20px; padding-top: 0px;">
<img src="https://orcid.org/sites/all/themes/orcid/img/orcid-logo.png" alt="ORCID.org"/>
<hr />
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<#if features["HTTPS_IDS"]?? && features["HTTPS_IDS"]>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" /><a href="${baseUri}/${orcid}?lang=${locale}">${baseUri}/${orcid}</a><@emailMacros.msg "email.locked.this_is_an_important_message.2" />
<#else>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" /><a href="${baseUriHttp}/${orcid}?lang=${locale}">${baseUriHttp}/${orcid}</a><@emailMacros.msg "email.locked.this_is_an_important_message.2" />
</#if>
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.locked.orcid_registry_provides_identifiers" /><@emailMacros.space /><@emailMacros.msg "email.locked.please_see" /><@emailMacros.space /><a href="https://info.orcid.org/terms-of-use/"><@emailMacros.msg "email.locked.terms_of_use" /></a><@emailMacros.space /><@emailMacros.msg "email.locked.further_information" />
</p>
<#include "email_footer_html.ftl"/>
</div>
</body>
</html>
</#escape>
<hr />
<span style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C; font-weight: bold;">
<@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}<@emailMacros.msg "email.common.dear.comma" />
</span>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<#if features["HTTPS_IDS"]?? && features["HTTPS_IDS"]>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" /><a href="${baseUri}/${orcid}?lang=${locale}">${baseUri}/${orcid}</a><@emailMacros.msg "email.locked.this_is_an_important_message.2" />
<#else>
<@emailMacros.msg "email.locked.this_is_an_important_message.1" /><a href="${baseUriHttp}/${orcid}?lang=${locale}">${baseUriHttp}/${orcid}</a><@emailMacros.msg "email.locked.this_is_an_important_message.2" />
</#if>
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.locked.the_orcid_registry_provides" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.locked.if_you_believe_html" />
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C; white-space: pre;">
<@emailMacros.msg "email.common.warm_regards" />
<a href='<@emailMacros.msg "email.common.need_help.description.2.href" />' target="orcid.contact_us"><@emailMacros.msg "email.common.need_help.description.2.href" /></a>
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C;">
<a href="${baseUri}/home?lang=${locale}">${baseUri}/</a>
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C;">
<@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"/>
</p>
</div>
</body>
</html>
</#escape>
5 changes: 3 additions & 2 deletions orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<@emailMacros.msg "email.reset_password_not_found.we_could_not_find" /><@emailMacros.space />${submittedEmail}
<@emailMacros.msg "email.reset_password_not_found.registered_using_another_email" /><@emailMacros.space /><a href="https://orcid.org/reset-password"><@emailMacros.msg "email.reset_password_not_found.try_another_email" /></a><@emailMacros.space /><@emailMacros.msg "email.reset_password_not_found.many_users_have" />
<@emailMacros.msg "email.reset_password_not_found.id_associated_with_email_no_longer_access" />
<@emailMacros.msg "email.reset_password_not_found.not_registered_using_other_email" />
<@emailMacros.msg "email.reset_password_not_found.id_associated_with_email_no_longer_access" /><@emailMacros.space /><a href="https://support.orcid.org/hc/en-us/requests/new?ticket_form_id=360003481994"><@emailMacros.msg "email.reset_password_not_found.contact_us" /></a>
<@emailMacros.msg "email.reset_password_not_found.not_registered_using_other_email" /><@emailMacros.space /><a href="https://orcid.org/register"><@emailMacros.msg "email.reset_password_not_found.register_for_an_orcid" /></a>


<#include "email_footer.ftl"/>
6 changes: 3 additions & 3 deletions ...d-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email_html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<ul>
<li>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.reset_password_not_found.registered_using_another_email" /><@emailMacros.space /><a href="https://orcid.org/reset-password"><@emailMacros.msg "email.reset_password_not_found.try_another_email" /></a><@emailMacros.space /><@emailMacros.msg "email.reset_password_not_found.many_users_have" />
<@emailMacros.msg "email.reset_password_not_found.registered_using_another_email" /><@emailMacros.space /><a href="${baseUri}/reset-password"><@emailMacros.msg "email.reset_password_not_found.try_another_email" /></a><@emailMacros.space /><@emailMacros.msg "email.reset_password_not_found.many_users_have" />
</p>
</li>
<li>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.reset_password_not_found.id_associated_with_email_no_longer_access" />
<@emailMacros.msg "email.reset_password_not_found.id_associated_with_email_no_longer_access" /><@emailMacros.space /><a href="https://support.orcid.org/hc/en-us/requests/new?ticket_form_id=360003481994"><@emailMacros.msg "email.reset_password_not_found.contact_us" /></a>
</p>
</li>
<li>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.reset_password_not_found.not_registered_using_other_email" />
<@emailMacros.msg "email.reset_password_not_found.not_registered_using_other_email" /><@emailMacros.space /><a href="${baseUri}/register"><@emailMacros.msg "email.reset_password_not_found.register_for_an_orcid" /></a>
</p>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions orcid-core/src/main/resources/org/orcid/core/template/welcome_email_html_v2.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<img src="https://orcid.org/sites/all/themes/orcid/img/orcid-logo.png" alt="ORCID.org"/>
<hr />
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.welcome.thank_you_for_creating" /><@emailMacros.space />${orcidId}<@emailMacros.space /><@emailMacros.msg "email.welcome.full_orcid_and_link_public" /><@emailMacros.space /><a href="${baseUri}/${orcidId}" target="orcid.blank">${baseUri}/${orcidId}</a>
<@emailMacros.msg "email.welcome.thank_you_for_creating" /><@emailMacros.space />${orcidId}<@emailMacros.msg "email.welcome.full_orcid_and_link_public" /><@emailMacros.space /><a href="${baseUri}/${orcidId}" target="orcid.blank">${baseUri}/${orcidId}</a>
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.welcome.please_verify_your_email" />
Expand Down Expand Up @@ -82,7 +82,7 @@


<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.welcome.please_visit_your" /><@emailMacros.space /><a href="https://info.orcid.org/researchers/" target="orcid.blank"><@emailMacros.msg "email.welcome.researcher_home_page" /></a><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" />
<@emailMacros.msg "email.welcome.please_visit_your" /><@emailMacros.space /><a href="https://info.orcid.org/researchers/" target="orcid.blank"><@emailMacros.msg "email.welcome.researcher_homepage" /></a><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" />
</p>
<#include "email_footer_html.ftl"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion orcid-core/src/main/resources/org/orcid/core/template/welcome_email_v2.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@

${verificationUrl}?lang=${locale}

<@emailMacros.msg "email.welcome.please_visit_your" /><@emailMacros.space /><@emailMacros.msg "email.welcome.researcher_home_page" /><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" />
<@emailMacros.msg "email.welcome.please_visit_your" /><@emailMacros.space /><@emailMacros.msg "email.welcome.researcher_homepage" /><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" />

<#include "email_footer.ftl"/>