From 7cf0676a63e63d617d170f624aa4dd3059374380 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Thu, 2 Nov 2023 13:05:25 -0600 Subject: [PATCH] Rename key --- .../src/main/java/org/orcid/core/utils/VerifyEmailUtils.java | 2 +- orcid-core/src/main/resources/i18n/email_subject_ar.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_ca.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_cs.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_de.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_en.properties | 2 +- orcid-core/src/main/resources/i18n/email_subject_es.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_fr.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_id.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_it.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_ja.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_ko.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_lr.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_pl.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_pt.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_rl.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_ru.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_tr.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_uk.properties | 1 - orcid-core/src/main/resources/i18n/email_subject_xx.properties | 1 - .../src/main/resources/i18n/email_subject_zh_CN.properties | 1 - .../src/main/resources/i18n/email_subject_zh_TW.properties | 1 - 22 files changed, 2 insertions(+), 22 deletions(-) diff --git a/orcid-core/src/main/java/org/orcid/core/utils/VerifyEmailUtils.java b/orcid-core/src/main/java/org/orcid/core/utils/VerifyEmailUtils.java index 0131c314c97..d1abc34709c 100644 --- a/orcid-core/src/main/java/org/orcid/core/utils/VerifyEmailUtils.java +++ b/orcid-core/src/main/java/org/orcid/core/utils/VerifyEmailUtils.java @@ -35,7 +35,7 @@ public Map createParamsForVerificationEmail(String emailFriendly 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" : "email.subject.verify_reminder"), locale)); + 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; diff --git a/orcid-core/src/main/resources/i18n/email_subject_ar.properties b/orcid-core/src/main/resources/i18n/email_subject_ar.properties index 885c36e3cdb..975f2b7aba6 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_ar.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_ar.properties @@ -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=[أوركيد] لم يُعثرعلى عنوان البريد الإلكتروني diff --git a/orcid-core/src/main/resources/i18n/email_subject_ca.properties b/orcid-core/src/main/resources/i18n/email_subject_ca.properties index 6b48d4fa518..0b5a5d9a0a1 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_ca.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_ca.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_cs.properties b/orcid-core/src/main/resources/i18n/email_subject_cs.properties index 2becbef9fc6..3e555be3c83 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_cs.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_cs.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_de.properties b/orcid-core/src/main/resources/i18n/email_subject_de.properties index 16883e5108e..b554ad831bc 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_de.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_de.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_en.properties b/orcid-core/src/main/resources/i18n/email_subject_en.properties index fe7cf273f76..a9f3f3188b5 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_en.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_en.properties @@ -2,7 +2,7 @@ # NotificaionManager.java email.subject.verify_reminder=[ORCID] Verify your email address -email.subject.verify_reminder_primary=[ORCID] Don't forget to verify your 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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_es.properties b/orcid-core/src/main/resources/i18n/email_subject_es.properties index 7c796365225..0ba53f7eb5f 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_es.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_es.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_fr.properties b/orcid-core/src/main/resources/i18n/email_subject_fr.properties index f2bd3993513..bac67ff7443 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_fr.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_fr.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_id.properties b/orcid-core/src/main/resources/i18n/email_subject_id.properties index 6b48d4fa518..0b5a5d9a0a1 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_id.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_id.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_it.properties b/orcid-core/src/main/resources/i18n/email_subject_it.properties index 6ed321079a4..5754f682579 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_it.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_it.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_ja.properties b/orcid-core/src/main/resources/i18n/email_subject_ja.properties index ccfbfafacc6..4a6d4cfdfa3 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_ja.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_ja.properties @@ -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]メールアドレスが見つかりません diff --git a/orcid-core/src/main/resources/i18n/email_subject_ko.properties b/orcid-core/src/main/resources/i18n/email_subject_ko.properties index 3701a53688d..d33abacfade 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_ko.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_ko.properties @@ -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] 이메일 주소를 찾을 수 없습니다 diff --git a/orcid-core/src/main/resources/i18n/email_subject_lr.properties b/orcid-core/src/main/resources/i18n/email_subject_lr.properties index fc93ef4a484..50d0def7de4 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_lr.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_lr.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_pl.properties b/orcid-core/src/main/resources/i18n/email_subject_pl.properties index ed46eb6c333..34d238b0e47 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_pl.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_pl.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_pt.properties b/orcid-core/src/main/resources/i18n/email_subject_pt.properties index e5aeb6bbf1c..f3fb41da3f2 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_pt.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_pt.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_rl.properties b/orcid-core/src/main/resources/i18n/email_subject_rl.properties index af169e63093..e00536230e5 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_rl.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_rl.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_ru.properties b/orcid-core/src/main/resources/i18n/email_subject_ru.properties index b4257fccb9e..9b21a4a82b0 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_ru.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_ru.properties @@ -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] Адрес эл. почты не найден diff --git a/orcid-core/src/main/resources/i18n/email_subject_tr.properties b/orcid-core/src/main/resources/i18n/email_subject_tr.properties index b08f84fb77e..a111f048d57 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_tr.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_tr.properties @@ -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ı diff --git a/orcid-core/src/main/resources/i18n/email_subject_uk.properties b/orcid-core/src/main/resources/i18n/email_subject_uk.properties index 6b48d4fa518..0b5a5d9a0a1 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_uk.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_uk.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_xx.properties b/orcid-core/src/main/resources/i18n/email_subject_xx.properties index 5303c506111..aa44675208a 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_xx.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_xx.properties @@ -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 diff --git a/orcid-core/src/main/resources/i18n/email_subject_zh_CN.properties b/orcid-core/src/main/resources/i18n/email_subject_zh_CN.properties index a517af6f11d..d93446cb9b7 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_zh_CN.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_zh_CN.properties @@ -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] 未找到电子邮箱地址 diff --git a/orcid-core/src/main/resources/i18n/email_subject_zh_TW.properties b/orcid-core/src/main/resources/i18n/email_subject_zh_TW.properties index 8db12c5555e..8ccc5cf783f 100644 --- a/orcid-core/src/main/resources/i18n/email_subject_zh_TW.properties +++ b/orcid-core/src/main/resources/i18n/email_subject_zh_TW.properties @@ -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] 找不到電子郵件地址