Skip to content

Commit

Permalink
Merge pull request #6923 from ORCID/UpdatesOnTheEmailVerificationEmails
Browse files Browse the repository at this point in the history
Welcome email ready to go
  • Loading branch information
leomendoza123 authored Nov 2, 2023
2 parents 2328f59 + e4a0673 commit a1334ca
Show file tree
Hide file tree
Showing 92 changed files with 720 additions and 2,613 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,14 @@ public class VerifyEmailUtils {
@Resource
private EncryptionManager encryptionManager;

public Map<String, Object> createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, String primaryEmail, Locale locale) {
public Map<String, Object> createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, boolean isPrimary, Locale locale) {
Map<String, Object> templateParams = new HashMap<String, Object>();

String subject = getSubject(primaryEmail.equalsIgnoreCase(email) ? "email.subject.verify_reminder_primary" : "email.subject.verify_reminder", locale);

templateParams.put("primaryEmail", primaryEmail);
templateParams.put("isPrimary", primaryEmail.equalsIgnoreCase(email));
templateParams.put("emailName", emailFriendlyName);
String verificationUrl = createVerificationUrl(email, orcidUrlManager.getBaseUrl());
templateParams.put("verificationUrl", verificationUrl);
templateParams.put("orcid", orcid);
templateParams.put("email", email);
templateParams.put("subject", subject);
templateParams.put("baseUri", orcidUrlManager.getBaseUrl());
templateParams.put("baseUriHttp", orcidUrlManager.getBaseUriHttp());
templateParams.put("isPrimary", isPrimary);
templateParams.put("userName", emailFriendlyName);
templateParams.put("verificationUrl", createVerificationUrl(email, orcidUrlManager.getBaseUrl()));
templateParams.put("orcidId", orcid);
templateParams.put("subject", getSubject((isPrimary ? "email.subject.verify_reminder_primary_address" : "email.subject.verify_reminder"), locale));
templateParams.put("baseUri", orcidUrlManager.getBaseUrl());
addMessageParams(templateParams, locale);
return templateParams;
}
Expand Down
3 changes: 3 additions & 0 deletions orcid-core/src/main/resources/i18n/email_common_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ 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.received_email_as_service=You have received this email as a service announcement related to your ORCID Account.

email.welcome.your_id.id=Your ORCID iD:
email.welcome.your_id.link=Your ORCID record is
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[أوركيد] تحقّق من عنوان بريدك الإلكتروني
email.subject.verify_reminder_primary=[أوركيد] رسالة تذكير للتحقّق من عنوان بريدك الإلكتروني الأساسي
email.subject.reset=[أوركيد] حول طلبك لإعادة تعيين كلمة المرور
email.subject.forgotten_id=[أوركيد] معرّف أوركيد الخاص بك
email.subject.reset_not_found=[أوركيد] لم يُعثرعلى عنوان البريد الإلكتروني
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verify your email address
email.subject.verify_reminder_primary=[ORCID] Reminder to verify your primary email address
email.subject.reset=[ORCID] About your password reset request
email.subject.forgotten_id=[ORCID] Your ORCID iD
email.subject.reset_not_found=[ORCID] Email address not found
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Ověřte svou e-mailovou adresu
email.subject.verify_reminder_primary=[ORCID] Připomenutí k ověření vaší primární e-mailové adresy
email.subject.reset=[ORCID] Ohledně vaší žádosti na obnovení hesla
email.subject.forgotten_id=[ORCID] Vaše ORCID iD
email.subject.reset_not_found=[ORCID] E-mailová adresa nenalezena
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Bestätigen Sie Ihre E-Mail-Adresse
email.subject.verify_reminder_primary=[ORCID] Erinnerung zur Bestätigung Ihrer primären E-Mail-Adresse
email.subject.reset=[ORCID] Zu Ihrer Anfrage zum Zurücksetzen des Passworts
email.subject.forgotten_id=[ORCID] Ihre ORCID-iD
email.subject.reset_not_found=[ORCID] E-Mail-Adresse nicht gefunden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verify your email address
email.subject.verify_reminder_primary=[ORCID] Reminder to verify your primary email address
email.subject.verify_reminder_primary_address=[ORCID] Don't forget to verify your email address
email.subject.reset=[ORCID] About your password reset request
email.subject.forgotten_id=[ORCID] Your ORCID iD
email.subject.reset_not_found=[ORCID] Email address not found
Expand All @@ -17,5 +17,5 @@ email.subject.admin_as_delegate=[ORCID] Trusting {0} with your ORCID Record
email.subject.locked=[ORCID] Your account has been locked
email.subject.auto_deprecate=[ORCID] An account has been deprecated
email.subject.reactivation=[ORCID] Reactivating your ORCID record
email.subject.register.welcome=[ORCID] Welcome to ORCID - verify your email address
email.subject.register.welcome=[ORCID] Welcome to ORCID
email.subject.delegate.recipient=[ORCID] You've made an Account Delegate!
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verifique su dirección de correo electrónico
email.subject.verify_reminder_primary=[ORCID] Recordatorio para verificar su dirección de correo electrónico principal
email.subject.reset=[ORCID] Acerca de su solicitud de restablecimiento de contraseña
email.subject.forgotten_id=[ORCID] Su ORCID iD
email.subject.reset_not_found=[ORCID] Dirección de correo electrónico no encontrada
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Vérifiez votre adresse e-mail\n
email.subject.verify_reminder_primary=[ORCID] Rappel de la vérification de votre adresse e-mail principale
email.subject.reset=[ORCID] À propos de votre demande de réinitialisation de mot de passe\n
email.subject.forgotten_id=[ORCID] Votre iD d'ORCID\n
email.subject.reset_not_found=[ORCID] Adresse e-mail non trouvée
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verify your email address
email.subject.verify_reminder_primary=[ORCID] Reminder to verify your primary email address
email.subject.reset=[ORCID] About your password reset request
email.subject.forgotten_id=[ORCID] Your ORCID iD
email.subject.reset_not_found=[ORCID] Email address not found
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verifica il tuo indirizzo email\n
email.subject.verify_reminder_primary=[ORCID] Promemoria per verificare il tuo indirizzo e-mail primario\n
email.subject.reset=[ORCID] Riguardo alla tua richiesta di reimpostazione della password\n
email.subject.forgotten_id=[ORCID] Il tuo ORCID iD
email.subject.reset_not_found=[ORCID] Indirizzo e-mail non trovato\n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] メールアドレスを認証してください
email.subject.verify_reminder_primary=[ORCID] あなたのメインのメールアドレスを認証するためのリマインダー
email.subject.reset=[ORCID] パスワードリセットのリクエストについて
email.subject.forgotten_id=[ORCID] あなたのORCID iD
email.subject.reset_not_found=[ORCID]メールアドレスが見つかりません
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] 이메일 주소 확인
email.subject.verify_reminder_primary=[ORCID] 귀하의 기본 이메일 주소 확인 알림
email.subject.reset=[ORCID] 귀하의 비밀번호 초기화 요청
email.subject.forgotten_id=[ORCID] 귀하의 ORCID iD
email.subject.reset_not_found=[ORCID] 이메일 주소를 찾을 수 없습니다
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
email.subject.verification=LR
email.subject.verify_reminder=LR
email.subject.verify_reminder_primary=LR
email.subject.reset=LR
email.subject.forgotten_id=LR
email.subject.reset_not_found=LR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Zweryfikuj swój adres e-mail
email.subject.verify_reminder_primary=[ORCID] Przypomnienie o zweryfikowaniu podstawowego adresu e-mail
email.subject.reset=[ORCID] Informacje o prośbie o zresetowanie hasła
email.subject.forgotten_id=[ORCID] Twój ORCID ID
email.subject.reset_not_found=[ORCID] Nie znaleziono adresu e-mail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verifique o seu endereço de e-mail
email.subject.verify_reminder_primary=[ORCID] Lembrete para verificar o seu endereço de correio eletrónico principal
email.subject.reset=[ORCID] A respeito do seu pedido de redefinição da palavra-passe
email.subject.forgotten_id=[ORCID] O seu iD ORCID
email.subject.reset_not_found=[ORCID] Endereço de e-mail não encontrado
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
email.subject.verification=RL
email.subject.verify_reminder=RL
email.subject.verify_reminder_primary=RL
email.subject.reset=RL
email.subject.forgotten_id=RL
email.subject.reset_not_found=RL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Подтвердите ваш адрес электронной почты
email.subject.verify_reminder_primary=[ORCID] Напоминание подтвердить Ваш основной адрес эл. почты
email.subject.reset=[ORCID] Касательно Вашего запроса на сброс пароля
email.subject.forgotten_id=[ORCID] Ваш идентификатор ORCID
email.subject.reset_not_found=[ORCID] Адрес эл. почты не найден
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] E-posta adresinizi doğrulayın
email.subject.verify_reminder_primary=[ORCID] Birincil e-posta adresinizi doğrulamanız için anımsatıcı
email.subject.reset=[ORCID] Parola sıfırlama isteğiniz hakkında
email.subject.forgotten_id=[ORCID] ORCID kimliğiniz
email.subject.reset_not_found=[ORCID] E-posta adresi bulunamadı
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] Verify your email address
email.subject.verify_reminder_primary=[ORCID] Reminder to verify your primary email address
email.subject.reset=[ORCID] About your password reset request
email.subject.forgotten_id=[ORCID] Your ORCID iD
email.subject.reset_not_found=[ORCID] Email address not found
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
email.subject.verification=X
email.subject.verify_reminder=X
email.subject.verify_reminder_primary=X
email.subject.reset=X
email.subject.forgotten_id=X
email.subject.reset_not_found=X
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] 验证您的电子邮箱地址
email.subject.verify_reminder_primary=[ORCID] 验证主电子邮箱地址提醒
email.subject.reset=[ORCID] 关于您的密码重置请求
email.subject.forgotten_id=[ORCID] 您的 ORCID iD 号
email.subject.reset_not_found=[ORCID] 未找到电子邮箱地址
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# NotificaionManager.java

email.subject.verify_reminder=[ORCID] 驗證您的電子郵件地址
email.subject.verify_reminder_primary=[ORCID] 提醒您驗證您的主要電子郵件地址
email.subject.reset=[ORCID] 關於您的密碼重設請求
email.subject.forgotten_id=[ORCID] 您的 ORCID iD
email.subject.reset_not_found=[ORCID] 找不到電子郵件地址
Expand Down
17 changes: 4 additions & 13 deletions orcid-core/src/main/resources/i18n/email_verify_ar.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
#verification_email.ftl
#################################################
## Used on:
## Used on:
# verification_email

email.verify.primary_reminder_v2=هذا تذكير بأنك بحاجة إلى التحقق من عنوان بريدك الإلكتروني الأساسي قبل أن تتمكن من البدء في إضافة معلومات مثل الانتماء أو السيرة الذاتية أو الكلمات الرئيسية يدويًا إلى سجل أوركيد الخاص بك.
email.verify.primary_reminder=هذا تذكير بأنك بحاجة إلى التحقق من عنوان بريدك الإلكتروني الأساسي قبل أن تتمكن من البدء في إضافة المعلومات يدويًا إلى سجِّل أوركيد الخاصة بك.
email.verify.thank_you=للتحقّق من عنوان بريدك الإلكتروني، انقر فوق الرابط التالي وسجّلْ الدخول إلى سجلّ أوركيد الخاص بك. إذا لم تتمكن من النقر فوق الرابط، فقم بنسخه ولصقه في شريط عنوان المتصفح:
email.verify.thank_you_button=للتحقق من عنوان بريدك الإلكتروني، انقر فوق الزر التالي وقم بتسجيل الدخول إلى سجل أوركيد الخاص بك. إذا لم تتمكن من النقر فوق الزر، فانسخ الرابط أدناه والصقه في شريط عنوان المتصفح الخاص بك:
#${verificationUrl}
email.verify.1=معرِّف أوركيد المكوَّن من 16 رقمًا هو
#${orcid}
email.verify.2=، ومعرِّف أوركيد الكامل الخاص بك والرابط إلى سجلّك العام هو
#${pubBaseUri}/${orcid}
email.verify.primary_email_1=(عنوان البريد الإلكتروني الرئيسي:
email.verify.primary_email_2=)
email.verify.if_you_did_not=إذا لم تضف عنوان البريد الإلكتروني هذا إلى سجل أوركيد الخاص بك، فيرجى الاتصال بنا على الفور من خلال الرد على هذا البريد الإلكتروني.
email.verify.hi=Hi
email.verify.primary.reminder=This is a friendly reminder to verify your email address in your ORCID record so that you can unlock advanced editing features in your ORCID record. Until then, you will only be able to manage your names and email addresses in your ORCID record.
email.verify.alternate.reminder=You need to verify your email address.
17 changes: 4 additions & 13 deletions orcid-core/src/main/resources/i18n/email_verify_ca.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
#verification_email.ftl
#################################################
## Used on:
## Used on:
# verification_email

email.verify.primary_reminder_v2=This is a reminder that you need to verify your primary email address before you can begin adding information such as your affiliation, biography, or keywords manually to your ORCID record.
email.verify.primary_reminder=This is a reminder that you need to verify your primary email address before you can begin adding information manually to your ORCID record.
email.verify.thank_you=To verify your email address, 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.verify.thank_you_button=To verify your email address, click the following button and sign into your ORCID record. If you can't click the button, copy and paste the link below into your browser's address bar:
#${verificationUrl}
email.verify.1=Your 16-digit ORCID identifier is
#${orcid}
email.verify.2=, and your full ORCID iD and the link to your public record is
#${pubBaseUri}/${orcid}
email.verify.primary_email_1=(primary email address:
email.verify.primary_email_2=)
email.verify.if_you_did_not=If you did not add this email address to your ORCID record, please contact us immediately by replying to this email.
email.verify.hi=Hi
email.verify.primary.reminder=This is a friendly reminder to verify your email address in your ORCID record so that you can unlock advanced editing features in your ORCID record. Until then, you will only be able to manage your names and email addresses in your ORCID record.
email.verify.alternate.reminder=You need to verify your email address.
17 changes: 4 additions & 13 deletions orcid-core/src/main/resources/i18n/email_verify_cs.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
#verification_email.ftl
#################################################
## Used on:
## Used on:
# verification_email

email.verify.primary_reminder_v2=Toto je připomenutí, že je třeba ověřit vaši primární e-mailovou adresu, než budete moci do svého ORCID záznamu začít ručně přidávat informace, jako je vaše přidružení, životopis nebo klíčová slova.
email.verify.primary_reminder=Toto je připomenutí, že je třeba ověřit vaši primární e-mailovou adresu, než budete moci začít manuálně přidávat informace do svého ORCID záznamu.
email.verify.thank_you=Chcete-li ověřit svou e-mailovou adresu, klikněte na následující odkaz a přihlaste se do svého ORCID záznamu. Pokud nemůžete kliknout na odkaz, zkopírujte jej a vložte do adresního řádku svého prohlížeče:
email.verify.thank_you_button=Abyste ověřili svou e-mailovou adresu, klikněte na následující tlačítko a přihlaste se do svého záznamu ORCID. Pokud nemůžete na tlačítko kliknout, zkopírujte si odkaz níže a vložte jej do adresního řádu svého prohlížeče:
#${verificationUrl}
email.verify.1=Váš 16místný identifikátor ORCID je
#${orcid}
email.verify.2=, a svým úplným ORCID iD a odkaz na váš veřejný záznam je
#${pubBaseUri}/${orcid}
email.verify.primary_email_1=(primární e-mailová adresa:
email.verify.primary_email_2=)
email.verify.if_you_did_not=Pokud jste tuto e-mailovou adresu do svého ORCID záznamu nepřidali, ihned nás prosím kontaktujte odpovědí na tento e-mail.
email.verify.hi=Hi
email.verify.primary.reminder=This is a friendly reminder to verify your email address in your ORCID record so that you can unlock advanced editing features in your ORCID record. Until then, you will only be able to manage your names and email addresses in your ORCID record.
email.verify.alternate.reminder=You need to verify your email address.
17 changes: 4 additions & 13 deletions orcid-core/src/main/resources/i18n/email_verify_de.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
#verification_email.ftl
#################################################
## Used on:
## Used on:
# verification_email

email.verify.primary_reminder_v2=Dies ist eine Erinnerung, dass Sie Ihre primäre E-Mail-Adresse bestätigen müssen, bevor Sie Informationen wie Ihre Zugehörigkeit, Biografie oder Schlüsselwörter manuell zu Ihrem ORCID-Eintrag hinzufügen können.
email.verify.primary_reminder=Denken Sie daran, dass Sie Ihre primäre E-Mail-Adresse bestätigen müssen, bevor Sie Informationen manuell zu Ihrem ORCID-Eintrag hinzufügen können.
email.verify.thank_you=Um Ihre E-Mail-Adresse zu bestätigen, klicken Sie auf den folgenden Link und melden Sie sich bei Ihrem ORCID-Eintrag an. Wenn Sie nicht auf den Link klicken können, kopieren Sie ihn in die Adressleiste Ihres Browsers:
email.verify.thank_you_button=Um Ihre E-Mail-Adresse zu bestätigen, klicken Sie auf die folgende Schaltfläche und melden Sie sich bei Ihrem ORCID-Eintrag an. Wenn Sie nicht auf die Schaltfläche klicken können, kopieren Sie den folgenden Link in die Adressleiste Ihres Browsers:
#${verificationUrl}
email.verify.1=Ihre 16-stellige ORCID-Kennung lautet
#${orcid}
email.verify.2=und Ihre vollständige ORCID-iD und der Link zu Ihrem öffentlichen Eintrag
#${pubBaseUri}/${orcid}
email.verify.primary_email_1=(primäre E-Mail-Adresse:
email.verify.primary_email_2=)
email.verify.if_you_did_not=Wenn Sie diese E-Mail-Adresse nicht zu Ihrem ORCID-Eintrag hinzugefügt haben, kontaktieren Sie uns bitte umgehend, indem Sie auf diese E-Mail antworten.
email.verify.hi=Hi
email.verify.primary.reminder=This is a friendly reminder to verify your email address in your ORCID record so that you can unlock advanced editing features in your ORCID record. Until then, you will only be able to manage your names and email addresses in your ORCID record.
email.verify.alternate.reminder=You need to verify your email address.
Loading

0 comments on commit a1334ca

Please sign in to comment.