Skip to content

Commit

Permalink
Merge pull request #6835 from ORCID/8734-update-the-registry-emails-t…
Browse files Browse the repository at this point in the history 
…o-remove-links-to-the-support-team-emails-and-forms

Update emails notifications
  • Loading branch information
@amontenegro
amontenegro authored Jul 26, 2023
2 parents 7327af2 + 2dee8ac commit 9681667
Show file tree
Hide file tree
Showing 33 changed files with 127 additions and 427 deletions.
1 change: 1 addition & 0 deletions orcid-core/src/main/resources/i18n/email2faDisabled_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ email.2fa_disabled.more_info.html=If you have any other questions or need help,
email.2fa_disabled.if_you_received=If you received this email but did not disable two-factor authentication, your account may have been compromised. Please contact support at https://support.orcid.org/hc/en-us/requests/new immediately.
email.2fa_disabled.more_info=If you have any other questions or need help, please visit our Knowledge Base at https://support.orcid.org/hc/en-us/articles/360006971673 or contact support at https://support.orcid.org/hc/en-us/requests/new.

email.2fa_disabled.two_factor_disabled=Two-factor authentication has been disabled on your ORCID record. This means we will no longer ask for your authentication code when you sign into ORCID.
3 changes: 2 additions & 1 deletion orcid-core/src/main/resources/i18n/email_common_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ email.common.reset_password.href=https://orcid.org/reset-password
email.common.email.preferences=email preferences
email.common.privacy_policy=privacy policy
email.common.address1=ORCID, Inc.
email.common.address2=10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA
email.common.address2=10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA
email.common.received_email_as_service=You have received this email as a service announcement related to your ORCID Account.
4 changes: 4 additions & 0 deletions orcid-core/src/main/resources/i18n/email_forgotten_id_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ email.forgotten_id.contact_us=If you have an iD associated with an email you no
email.forgotten_id.certain_not_regiser=If you are certain that you have not registered using any other email,
email.forgotten_id.certain_not_regiser_url=register for an ORCID iD
email.forgotten_id.the_orcid_associated_email=The ORCID iD associated with

email.forgotten_id.many_users_have=- many users have both a personal and an institutional email address on their records
email.forgotten_id.id_associated_with_email=If you have an iD associated with an email you no longer have access to and can't sign in using your ORCID iD and password
email.forgotten_id._please_contact_us=please contact us.
8 changes: 7 additions & 1 deletion orcid-core/src/main/resources/i18n/email_locked_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@ 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
<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.
7 changes: 6 additions & 1 deletion orcid-core/src/main/resources/i18n/email_reset_password_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@ email.reset_password.to_reset=Please click the link below to reset your password

email.reset_password.note=Please note that the link is only valid for four hours from the time that you requested it.

email.reset_password.if_you_did_not=If you did not request a password reset, or if you no longer need to reset your password, please disregard this email and your password will remain the same.
email.reset_password.if_you_did_not=If you did not request a password reset, or if you no longer need to reset your password, please disregard this email and your password will remain the same.

email.reset_password.the_orcid_registered=The ORCID iD registered to your address
email.reset_password.click_link_below=Please click the link below to reset your password. You can also copy and paste the link directly into your browser:
email.reset_password.link_only_valid=Please note that the link is only valid for four hours from the time that you requested it.
email.reset_password.not_request_password_reset=If you did not request a password reset, or if you no longer need to reset your password, please disregard this email and your password will remain the same.
11 changes: 10 additions & 1 deletion orcid-core/src/main/resources/i18n/email_reset_password_not_found_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ email.reset_password_not_found.unsure_whether=If you are unsure whether you have

email.reset_password_not_found.we_recommend=We recommend that you add at least one backup email address to help us determine\n\
whether you have an existing iD. It will also help to ensure that you don't lose\n\
access to your ORCID account if you change organizations in the future.
access to your ORCID account if you change organizations in the future.

email.reset_password_not_found.we_could_not_find=We could not find an ORCID iD associated with the email:
email.reset_password_not_found.registered_using_another_email=If you may have registered an ORCID iD using another email address, please
email.reset_password_not_found.try_another_email=try another email
email.reset_password_not_found.many_users_have=- many users have both a personal and an institutional email address on their records
email.reset_password_not_found.id_associated_with_email_no_longer_access=If you have an iD associated with an email you no longer have access to and can't sign in using your ORCID iD and password please
email.reset_password_not_found.contact_us=contact us
email.reset_password_not_found.not_registered_using_other_email=If you are certain that you have not registered using any other email,
email.reset_password_not_found.register_for_an_orcid=register for an ORCID iD.
7 changes: 7 additions & 0 deletions orcid-core/src/main/resources/i18n/email_welcome_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,10 @@ email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/ar
email.welcome.next_steps.2=2. Use your ORCID iD when publishing, applying for grants, and more
email.welcome.next_steps.2.description=Many systems ask for your ORCID iD in order to create a link between you and your research outputs and affiliations. Using your ORCID iD, and granting organizations permission to update your record whenever they request this will help you get credit for your work and reduce time spent on future record-keeping.
email.welcome.need_help=Need Help?

email.welcome.thank_you_for_creating=Thank you for creating your ORCID identifier. Your 16-digit ORCID identifier is
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.for_more_information=for more information on how to get the most out of your ORCID record.
13 changes: 0 additions & 13 deletions orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<#import "email_macros.ftl" as emailMacros />
<@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}<@emailMacros.msg "email.common.dear.comma" />

<@emailMacros.msg "email.deactivate.gdpr_you_have_asked.1" />
${baseUri}/${orcid}?lang=${locale}
Expand All @@ -12,16 +11,4 @@ ${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.more_info" />
https://support.orcid.org/hc/articles/360006973813

<@emailMacros.msg "email.deactivate.if_you_did" />https://support.orcid.org/hc/en-us/requests/new <@emailMacros.msg "email.deactivate.gdpr_or_by_replying" />

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


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

<#include "email_footer.ftl"/>
20 changes: 1 addition & 19 deletions orcid-core/src/main/resources/org/orcid/core/template/deactivate_orcid_email_html.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
<div style="padding: 20px; padding-top: 0px;">
<img src="https://orcid.org/sites/all/themes/orcid/img/orcid-logo.png" alt="ORCID.org"/>
<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;">
<@emailMacros.msg "email.deactivate.gdpr_you_have_asked.1" /><a href="${baseUri}/${orcid}?lang=${locale}" target="_blank">${baseUri}/${orcid}</a>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
Expand All @@ -23,22 +20,7 @@
<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.more_info" /><br/><a href="https://support.orcid.org/hc/articles/360006973813" target="_blank">https://support.orcid.org/hc/articles/360006973813</a>
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.deactivate.if_you_did" /> <a href="https://support.orcid.org/hc/en-us/requests/new" target="_blank">https://support.orcid.org/hc/en-us/requests/new</a> <@emailMacros.msg "email.deactivate.gdpr_or_by_replying" />
</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;">
<#include "email_footer_html.ftl"/>
</p>
<#include "email_footer_html.ftl"/>
</div>
</body>
</html>
Expand Down
12 changes: 1 addition & 11 deletions orcid-core/src/main/resources/org/orcid/core/template/email_2fa_disabled.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
<#import "email_macros.ftl" as emailMacros />
<@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}<@emailMacros.msg "email.common.dear.comma" />

<@emailMacros.msg "email.2fa_disabled.two_factor_auth_disabled" />

<@emailMacros.msg "email.2fa_disabled.if_you_received" />

<@emailMacros.msg "email.2fa_disabled.no_reply" />

<@emailMacros.msg "email.2fa_disabled.more_info" />

<@emailMacros.msg "email.common.warm_regards" />
<@emailMacros.msg "email.2fa_disabled.two_factor_disabled" />

<@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"/>
28 changes: 2 additions & 26 deletions orcid-core/src/main/resources/org/orcid/core/template/email_2fa_disabled_html.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,10 @@
<div style="padding: 20px; padding-top: 0px;">
<img src="https://orcid.org/sites/all/themes/orcid/img/orcid-logo.png" alt="ORCID.org"/>
<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;">
<@emailMacros.msg "email.2fa_disabled.two_factor_auth_disabled" />
<@emailMacros.msg "email.2fa_disabled.two_factor_disabled" />
</p>

<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.2fa_disabled.if_you_received.html" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.2fa_disabled.no_reply" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.2fa_disabled.more_info.html" />
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C; white-space: pre;">
<@emailMacros.msg "email.common.warm_regards" />
</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>
<#include "email_footer_html.ftl"/>
</div>
</body>
</html>
Expand Down
5 changes: 5 additions & 0 deletions orcid-core/src/main/resources/org/orcid/core/template/email_footer.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<@emailMacros.msg "email.common.warm_regards" />
https://support.orcid.org

<@emailMacros.msg "email.common.received_email_as_service" />

<@emailMacros.msg "email.common.email.preferences" /> (${baseUri}/account)
<@emailMacros.msg "email.common.privacy_policy" /> (${baseUri}/privacy-policy)
<@emailMacros.msg "email.common.address1" />
Expand Down
15 changes: 12 additions & 3 deletions orcid-core/src/main/resources/org/orcid/core/template/email_footer_html.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<#escape x as x?html>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C; white-space: pre;">
<@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>
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C;">
<@emailMacros.msg "email.common.received_email_as_service" />
</p>
<p style="font-family: arial, helvetica, sans-serif;font-size: 15px;color: #494A4C;">
<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}/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>
</#escape>
15 changes: 1 addition & 14 deletions orcid-core/src/main/resources/org/orcid/core/template/email_removed.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
<#import "email_macros.ftl" as emailMacros />
<@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}<@emailMacros.msg "email.common.dear.comma" />

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

<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space />${baseUri}/home?lang=${locale}<@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" />

<@emailMacros.msg "email.email_removed.please_click" />
${baseUri}/account?lang=${locale}

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

<@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"/>
25 changes: 2 additions & 23 deletions orcid-core/src/main/resources/org/orcid/core/template/email_removed_html.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,13 @@
<div style="padding: 20px; padding-top: 0px;">
<img src="https://orcid.org/sites/all/themes/orcid/img/orcid-logo.png" alt="ORCID.org"/>
<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;">
<@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 />${baseUri}/home?lang=${locale}<@emailMacros.msg "email.email_removed.while.2" />
<@emailMacros.msg "email.email_removed.while.1" /><@emailMacros.space /><a href="">${baseUri}/${orcid}</a><@emailMacros.msg "email.email_removed.while.2" />
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.email_removed.please_click" />${baseUri}/account?lang=${locale}
</p>
<p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
<@emailMacros.msg "email.email_removed.important_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>
<#include "email_footer_html.ftl"/>
</div>
</body>
</html>
Expand Down
7 changes: 0 additions & 7 deletions orcid-core/src/main/resources/org/orcid/core/template/forgot_id_email.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,4 @@
<@emailMacros.msg "email.forgotten_id.the_orcid_associated_email"/> ${submittedEmail} <@emailMacros.msg "email.reset_password.is_colon" />
${baseUri}/${orcid}

<@emailMacros.msg "email.common.if_you_have_any1" /><@emailMacros.space /><@emailMacros.msg "email.common.need_help.description.2.href" /><@emailMacros.msg "email.common.if_you_have_any2" />

<@emailMacros.msg "email.common.warm_regards" />
${baseUri}/home?lang=${locale}

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

<#include "email_footer.ftl"/>
14 changes: 1 addition & 13 deletions orcid-core/src/main/resources/org/orcid/core/template/forgot_id_email_html.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,7 @@
<br>
<a href="${baseUri}/${orcid}?lang=${locale}">${baseUri}/${orcid}</a>
</p>
<p>
<@emailMacros.msg "email.common.if_you_have_any" /><@emailMacros.space /><a href='https://support.orcid.org/hc/en-us/requests/new' target="orcid.contact_us"><@emailMacros.msg "email.common.if_you_have_any.contact_us" /></a><@emailMacros.msg "email.common.if_you_have_any2" />
</p>
<p style="white-space: pre;">
<@emailMacros.msg "email.common.warm_regards" />
<a href='${baseUri}/home?lang=${locale}' target="orcid.contact_us"><@emailMacros.msg "email.common.need_help.description.2.href" /></a>
</p>
<p>
<@emailMacros.msg "email.common.you_have_received_this_email" />
</p>
<p>
<#include "email_footer_html.ftl"/>
</p>
<#include "email_footer_html.ftl"/>
</div>
</body>
</html>
Expand Down
Loading

0 comments on commit 9681667

Please sign in to comment.