diff --git a/orcid-core/src/main/resources/i18n/email_deactivate_en.properties b/orcid-core/src/main/resources/i18n/email_deactivate_en.properties index 7073f030dfe..dcc66904f4a 100644 --- a/orcid-core/src/main/resources/i18n/email_deactivate_en.properties +++ b/orcid-core/src/main/resources/i18n/email_deactivate_en.properties @@ -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: diff --git a/orcid-core/src/main/resources/i18n/email_locked_en.properties b/orcid-core/src/main/resources/i18n/email_locked_en.properties index d16abfc4adc..700d5250f32 100644 --- a/orcid-core/src/main/resources/i18n/email_locked_en.properties +++ b/orcid-core/src/main/resources/i18n/email_locked_en.properties @@ -1,6 +1,6 @@ #locked_orcid_email.ftl ################################################# -## Used on: +## Used on: # locked_orcid_email @@ -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\ https://support.orcid.org/hc/en-us/requests/new 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. diff --git a/orcid-core/src/main/resources/i18n/email_welcome_en.properties b/orcid-core/src/main/resources/i18n/email_welcome_en.properties index 131f33181c9..cd9ffc14be1 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_en.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_en.properties @@ -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. diff --git a/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl index 75997e02793..3f32826e938 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl @@ -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" /> https://support.orcid.org/hc/articles/360006973813 + <#include "email_footer.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl index 3b2c4327262..3440a19dd95 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl @@ -20,6 +20,9 @@

<@emailMacros.msg "email.deactivate.please_note.1" /> <@emailMacros.msg "email.deactivate.please_note.2" /> <@emailMacros.msg "email.deactivate.please_note.3" />

+

+ <@emailMacros.msg "email.deactivate.reactivate_anytime" /> https://support.orcid.org/hc/articles/360006973813 +

<#include "email_footer_html.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl b/orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl index be95589e4fe..1238b4e38c0 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl @@ -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 />${baseUri}/${orcid}<@emailMacros.msg "email.email_removed.while.2" /> <#include "email_footer.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl index 2fa25bc8928..f392cbd22a6 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl @@ -13,7 +13,7 @@ <@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 />${baseUri}/${orcid}<@emailMacros.msg "email.email_removed.while.2" />

<#include "email_footer_html.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email.ftl index 7ce4aa7357e..00714ed9723 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email.ftl @@ -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" /> -<@emailMacros.msg "email.locked.orcid_registry_provides_identifiers" /><@emailMacros.space /><@emailMacros.msg "email.locked.please_see" /><@emailMacros.space /><@emailMacros.msg "email.locked.terms_of_use" /><@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"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email_html.ftl index b65b1e0c3ed..caba686ae71 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email_html.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/locked_orcid_email_html.ftl @@ -8,19 +8,37 @@
ORCID.org -
-

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

-

- <@emailMacros.msg "email.locked.orcid_registry_provides_identifiers" /><@emailMacros.space /><@emailMacros.msg "email.locked.please_see" /><@emailMacros.space /><@emailMacros.msg "email.locked.terms_of_use" /><@emailMacros.space /><@emailMacros.msg "email.locked.further_information" /> -

- <#include "email_footer_html.ftl"/> -
- - - +
+ + <@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}<@emailMacros.msg "email.locked.this_is_an_important_message.2" /> + <#else> + <@emailMacros.msg "email.locked.this_is_an_important_message.1" />${baseUriHttp}/${orcid}<@emailMacros.msg "email.locked.this_is_an_important_message.2" /> + +

+

+ <@emailMacros.msg "email.locked.the_orcid_registry_provides" /> +

+

+ <@emailMacros.msg "email.locked.if_you_believe_html" /> +

+

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

+

+ ${baseUri}/ +

+

+ <@emailMacros.msg "email.common.you_have_received_this_email" /> +

+

+ <#include "email_footer_html.ftl"/> +

+ + + + diff --git a/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email.ftl b/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email.ftl index aa94061348f..70cba66c9a3 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email.ftl @@ -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 /><@emailMacros.msg "email.reset_password_not_found.try_another_email" /><@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 /><@emailMacros.msg "email.reset_password_not_found.contact_us" /> +<@emailMacros.msg "email.reset_password_not_found.not_registered_using_other_email" /><@emailMacros.space /><@emailMacros.msg "email.reset_password_not_found.register_for_an_orcid" /> + <#include "email_footer.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email_html.ftl index 9525a17a5a8..428b573b061 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email_html.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/reset_password_not_found_email_html.ftl @@ -15,17 +15,17 @@ diff --git a/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_html_v2.ftl b/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_html_v2.ftl index 6dbec34d5d7..e7e997ee7ae 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_html_v2.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_html_v2.ftl @@ -28,7 +28,7 @@ ORCID.org

- <@emailMacros.msg "email.welcome.thank_you_for_creating" /><@emailMacros.space />${orcidId}<@emailMacros.space /><@emailMacros.msg "email.welcome.full_orcid_and_link_public" /><@emailMacros.space />${baseUri}/${orcidId} + <@emailMacros.msg "email.welcome.thank_you_for_creating" /><@emailMacros.space />${orcidId}<@emailMacros.msg "email.welcome.full_orcid_and_link_public" /><@emailMacros.space />${baseUri}/${orcidId}

<@emailMacros.msg "email.welcome.please_verify_your_email" /> @@ -82,7 +82,7 @@

- <@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_html.ftl"/> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_v2.ftl b/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_v2.ftl index 8e12396be8a..23f5ab9c28e 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_v2.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/welcome_email_v2.ftl @@ -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"/>