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 523900c3f62..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 @@ -29,21 +29,14 @@ public class VerifyEmailUtils { @Resource private EncryptionManager encryptionManager; - public Map createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, String primaryEmail, Locale locale) { + public Map createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, boolean isPrimary, Locale locale) { Map templateParams = new HashMap(); - - 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; } diff --git a/orcid-core/src/main/resources/i18n/email_common_en.properties b/orcid-core/src/main/resources/i18n/email_common_en.properties index 4f684ba6c2f..f53bb0cd213 100644 --- a/orcid-core/src/main/resources/i18n/email_common_en.properties +++ b/orcid-core/src/main/resources/i18n/email_common_en.properties @@ -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 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 b517db4da7f..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] 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 @@ -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! 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] 找不到電子郵件地址 diff --git a/orcid-core/src/main/resources/i18n/email_verify_ar.properties b/orcid-core/src/main/resources/i18n/email_verify_ar.properties index 886e70839cc..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_ar.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_ar.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_ca.properties b/orcid-core/src/main/resources/i18n/email_verify_ca.properties index 69a2151878f..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_ca.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_ca.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_cs.properties b/orcid-core/src/main/resources/i18n/email_verify_cs.properties index 01afd37d8ef..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_cs.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_cs.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_de.properties b/orcid-core/src/main/resources/i18n/email_verify_de.properties index e237f68eb9e..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_de.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_de.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_en.properties b/orcid-core/src/main/resources/i18n/email_verify_en.properties index 89ccf28065e..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_en.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_en.properties @@ -3,15 +3,6 @@ ## 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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_es.properties b/orcid-core/src/main/resources/i18n/email_verify_es.properties index 426b17ebc99..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_es.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_es.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Este es un recordatorio de que necesitas verificar tu dirección de correo electrónico principal antes de poder empezar a añadir manualmente información como tu afiliación, biografía o palabras clave a tu registro ORCID. -email.verify.primary_reminder=Esto es un recordatorio de que necesitas verificar tu dirección de correo electrónico principal para poder comenzar a añadir información manualmente a tu registro ORCID. -email.verify.thank_you=Para verificar tu dirección de correo electrónico, has clic en el siguiente enlace y accede a tu registro ORCID. Si no puedes hacer clic en el enlace, cópialo y pégalo en la barra de direcciones de tu navegador: -email.verify.thank_you_button=Para verificar tu dirección de correo electrónico, has clic en el siguiente botón y accede a tu registro ORCID. Si no puedes hacer clic en el botón, copia y pega el siguiente enlace en la barra de direcciones de tu navegador: -#${verificationUrl} -email.verify.1=Tu identificador ORCID de 16 dígitos es -#${orcid} -email.verify.2=, y tu ORCID iD completo y el enlace a tu registro público es -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(dirección de correo electrónico principal: -email.verify.primary_email_2=) -email.verify.if_you_did_not=Si no añadiste esta dirección de correo electrónico a tu cuenta ORCID ponte en contacto con nosotros inmediatamente contestando a este mensaje. +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_fr.properties b/orcid-core/src/main/resources/i18n/email_verify_fr.properties index 1d0c2cbe530..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_fr.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_fr.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Nous vous rappelons que vous devez vérifier votre adresse e-mail principale avant de pouvoir commencer à ajouter manuellement des informations telles que votre affiliation, votre biographie ou vos mots-clés à votre dossier ORCID. -email.verify.primary_reminder=Voici un rappel que vous devez vérifier votre adresse e-mail principale avant de pouvoir commencer à ajouter manuellement des informations à votre dossier ORCID.\n -email.verify.thank_you=Pour vérifier votre adresse e-mail, cliquez sur le lien suivant et connectez-vous à votre dossier ORCID. Si vous ne pouvez pas cliquer sur le lien, copiez et collez-le dans la barre d'adresse de votre navigateur : -email.verify.thank_you_button=Pour vérifier votre adresse e-mail, cliquez sur le bouton suivant et connectez-vous à votre dossier ORCID. Si vous ne pouvez pas cliquer sur le bouton, copiez et collez le lien ci-dessous dans la barre d'adresse de votre navigateur :\n -#${verificationUrl} -email.verify.1=Votre identifiant ORCID à 16 chiffres est\n -#${orcid} -email.verify.2=, et votre identifiant ORCID complet ainsi que le lien vers votre dossier public sont -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(adresse e-mail principale :\n -email.verify.primary_email_2=) -email.verify.if_you_did_not=Si vous n'avez pas ajouté cette adresse e-mail à votre dossier ORCID, veuillez nous contacter immédiatement en répondant à cet e-mail.\n +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_id.properties b/orcid-core/src/main/resources/i18n/email_verify_id.properties index 69a2151878f..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_id.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_id.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_it.properties b/orcid-core/src/main/resources/i18n/email_verify_it.properties index 1d24250ee7c..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_it.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_it.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Questo è un promemoria per ricordarti che devi verificare il tuo indirizzo email principale prima di poter iniziare ad aggiungere manualmente informazioni come affiliazione, biografia o parole chiave al tuo record ORCID. -email.verify.primary_reminder=Questo è un promemoria per ricordarti che devi verificare il tuo indirizzo email principale prima di poter iniziare ad aggiungere manualmente le informazioni al tuo record ORCID. -email.verify.thank_you=Per verificare il tuo indirizzo e-mail, clicca sul seguente link e accedi al tuo record ORCID. Se non riesci a cliccare il link, copialo e incollalo nella barra degli indirizzi del tuo browser:\n -email.verify.thank_you_button=Per verificare il tuo indirizzo email, fai clic sul pulsante seguente e accedi al tuo record ORCID. Se non riesci a fare clic sul pulsante, copia e incolla il collegamento sottostante nella barra degli indirizzi del browser: -#${verificationUrl} -email.verify.1=Il tuo identificatore ORCID di 16 cifre è -#${orcid} -email.verify.2=, e il tuo ORCID iD completo e il link al tuo record pubblico è\n -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(indirizzo email primario:\n -email.verify.primary_email_2=)\n -email.verify.if_you_did_not=Se non hai aggiunto questo indirizzo email al tuo record ORCID, contattaci immediatamente rispondendo a questa 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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_ja.properties b/orcid-core/src/main/resources/i18n/email_verify_ja.properties index 0667b1e0d35..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_ja.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_ja.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=これは、所属、経歴、キーワードなどの情報をORCIDレコードに手動で追加できるようにするには、メインのメールアドレスを認証する必要があることを知らせるリマインダーです。 -email.verify.primary_reminder=これは、ORCIDレコードに手動で情報を追加できるようにするには、メインのメールアドレスを認証する必要があることを知らせるリマインダーです。 -email.verify.thank_you=メールアドレスを確認するには、以下のリンクをクリックしてORCIDレコードにサインインしてください。リンクをクリックできない場合は、リンクをコピーしてブラウザのアドレスバーに貼り付けてください。 -email.verify.thank_you_button=メールアドレスを確認するには、以下のボタンをクリックしてORCIDレコードにサインインしてください。ボタンをクリックできない場合は、以下のリンクをコピーしてブラウザのアドレスバーに貼り付けてください： -#${verificationUrl} -email.verify.1=あなたの16桁のORCID識別子： -#${orcid} -email.verify.2=、および完全なORCID iDと公開記録へのリンクは -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=（プライマリメールアドレス： -email.verify.primary_email_2=) -email.verify.if_you_did_not=このメールアドレスをORCIDレコードに追加しなかった場合は、ただちにこのメールに返信してご連絡ください。 +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_ko.properties b/orcid-core/src/main/resources/i18n/email_verify_ko.properties index 6514c2fd91d..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_ko.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_ko.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=귀하의 소속기관, 바이오그래피, 키워드를 ORCID 레코드에 수동으로 더하기 전에 기본 이메일을 확인해야 한다는 것을 알려드립니다. -email.verify.primary_reminder=ORCID 레코드에 귀하의 정보를 수동으로 입력하기 전에 귀하의 기본 메일 주소를 확인해야한다는 알림입니다. -email.verify.thank_you=귀하의 이메일 주소를 확인하기 위해 다음의 링크를 클릭해 ORCID 레코드에 로그인하십시오. 링크를 클릭할 수 없는 경우에는 브라우저의 주소창에 링크를 복사 붙여넣기 하십시오. -email.verify.thank_you_button=이메일 주소를 확인하려면 다음 버튼을 클릭하여 ORCID 레코드에 로그인하십시오. 버튼을 클릭할 수 없는 경우 아래 링크를 복사하여 브라우저의 주소표시줄에 붙여넣으십시오. -#${verificationUrl} -email.verify.1=귀하의 16자리 ORCID 식별자는 -#${orcid} -email.verify.2=, 전체 ORCID iD 및 공개 기록에 대한 링크는 -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(기본 이메일 주소: -email.verify.primary_email_2=) -email.verify.if_you_did_not=이 이메일 주소를 ORCID 레코드에 추가하지 않은 경우 이 이메일에 회신하여 즉시 저희에게 연락주시기 바랍니다. +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_lr.properties b/orcid-core/src/main/resources/i18n/email_verify_lr.properties index 725fa9a2a91..bf0f0c8b9c4 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_lr.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_lr.properties @@ -1,9 +1,3 @@ -email.verify.primary_reminder_v2=LR -email.verify.primary_reminder=LR -email.verify.thank_you=LR -email.verify.thank_you_button=LR -email.verify.1=LR -email.verify.2=LR -email.verify.primary_email_1=LR -email.verify.primary_email_2=LR -email.verify.if_you_did_not=LR +email.verify.hi=LR +email.verify.primary.reminder=LR +email.verify.alternate.reminder=LR \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_pl.properties b/orcid-core/src/main/resources/i18n/email_verify_pl.properties index ca8fe288eb0..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_pl.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_pl.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Przypominamy, że musisz zweryfikować swój podstawowy adres e-mail, zanim zaczniesz ręcznie dodawać informacje, takie jak Twoje powiązania, biografia lub słowa kluczowe, do rekordu ORCID. -email.verify.primary_reminder=Przypominamy, że musisz zweryfikować swój podstawowy adres e-mail, zanim zaczniesz ręcznie dodawać informacje do swojego rekordu ORCID. -email.verify.thank_you=Aby zweryfikować swój adres e-mail, kliknij poniższe łącze i zaloguj się do swojego rekordu ORCID. Jeśli nie możesz kliknąć łącza , skopiuj je i wklej w pasku adresu przeglądarki: -email.verify.thank_you_button=Aby zweryfikować swój adres e-mail, kliknij poniższy przycisk i zaloguj się do swojego rekordu ORCID. Jeśli nie możesz kliknąć przycisku, skopiuj poniższe łącze i wklej je w pasku adresu przeglądarki: -#${verificationUrl} -email.verify.1=Twój 16-cyfrowy identyfikator ORCID to -#${orcid} -email.verify.2=, a Twój pełny identyfikator ORCID i łącze do Twojego rekordu publicznego to -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(podstawowy adres e-mail: -email.verify.primary_email_2=) -email.verify.if_you_did_not=Jeśli nie dodałeś(-aś) tego adresu e-mail do swojego rekordu ORCID, skontaktuj się z nami niezwłocznie, odpowiadając na ten 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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_pt.properties b/orcid-core/src/main/resources/i18n/email_verify_pt.properties index ec6f150517a..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_pt.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_pt.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Recordamos que é necessário verificar o seu endereço de correio eletrónico principal antes de poder começar a adicionar manualmente informações como a sua instituição, biografia ou palavras-chave ao seu registo ORCID. -email.verify.primary_reminder=Recordamos que é necessário verificar o seu endereço de correio eletrónico principal antes de poder começar a adicionar manualmente informações ao seu registo ORCID. -email.verify.thank_you=Para verificar o seu endereço de correio eletrónico, clique na seguinte ligação e inicie sessão no seu registo ORCID. Caso não consiga clicar na ligação, copie-a e cole-a na barra de endereços do seu navegador: -email.verify.thank_you_button=Para verificar o seu endereço de e-mail, clique no seguinte botão e conecte-se ao seu registo ORCID. Se não conseguir clicar no botão, copie e insira a ligação na barra de endereços do seu navegador: -#${verificationUrl} -email.verify.1=O seu identificador ORCID de 16 dígitos é -#${orcid} -email.verify.2=, e o seu ORCID iD completo e a ligação para o seu registo público está -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(endereço de correio eletrónico principal: -email.verify.primary_email_2=) -email.verify.if_you_did_not=Se não adicionou este endereço de e-mail ao seu registo ORCID, entre imediatamente em contacto connosco respondendo a este 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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_rl.properties b/orcid-core/src/main/resources/i18n/email_verify_rl.properties index af17c8f3f83..4b5246c7ccd 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_rl.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_rl.properties @@ -1,9 +1,3 @@ -email.verify.primary_reminder_v2=RL -email.verify.primary_reminder=RL -email.verify.thank_you=RL -email.verify.thank_you_button=RL -email.verify.1=RL -email.verify.2=RL -email.verify.primary_email_1=RL -email.verify.primary_email_2=RL -email.verify.if_you_did_not=RL +email.verify.hi=RL +email.verify.primary.reminder=RL +email.verify.alternate.reminder=RL \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_ru.properties b/orcid-core/src/main/resources/i18n/email_verify_ru.properties index 11df1e72799..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_ru.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_ru.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=Это напоминание о том, что Вам нужно подтвердить Ваш основной адрес электронной почты, прежде чем Вы сможете вносить изменения в Вашу учетную запись ORCID. -email.verify.primary_reminder=Напоминаем, что Вам необходимо подтвердить свой основной адрес эл. почты, чтобы получить возможность самостоятельно добавлять информацию в свою запись ORCID. -email.verify.thank_you=Для подтверждения Вашего адреса электронной почты перейдите по следующей ссылке и войдите в Ваш профиль ORCID. Если Вы не можете перейти по ссылке, то скопируйте и вставьте её в адресную строку Вашего браузера: -email.verify.thank_you_button=Для подтверждения своего адреса эл. почты нажмите на следующую кнопку и войдите в свою запись ORCID. Если Вам не удается нажать на кнопку, тогда скопируйте и вставьте нижеприведенную ссылку в адресную строку своего браузера: -#${verificationUrl} -email.verify.1=Ваш 16-значный идентификатор ORCID: -#${orcid} -email.verify.2=и Ваш полный идентификатор ORCID и ссылка на Ваш публичный профиль: -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(основной адрес эл. почты: -email.verify.primary_email_2=) -email.verify.if_you_did_not=Если Вы не добавляли этот адрес эл. почты в свою запись ORCID, тогда немедленно обратитесь к нам, ответив на это эл. письмо. +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_tr.properties b/orcid-core/src/main/resources/i18n/email_verify_tr.properties index 47486268420..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_tr.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_tr.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=ORCID kaydınıza bağlantınız, biyografiniz veya anahtar kelimeleriniz gibi bilgileri manuel olarak eklemeye başlamadan önce birincil e-posta adresinizi doğrulamanız gerektiğini hatırlatır. -email.verify.primary_reminder=Bu, ORCID kaydınıza manuel olarak bilgi eklemeye başlamadan önce birincil e-posta adresinizi doğrulamanız gerektiğini hatırlatır. -email.verify.thank_you=E-posta adresinizi doğrulamak için aşağıdaki bağlantıya tıklayın ve ORCID kaydınızda oturum açın. Bağlantıya tıklayamıyorsanız kopyalayıp tarayıcınızın adres çubuğuna yapıştırın: -email.verify.thank_you_button=E-posta adresinizi doğrulamak için aşağıdaki düğmeye tıklayın ve ORCID kaydınızda oturum açın. Düğmeyi tıklayamıyorsanız aşağıdaki bağlantıyı kopyalayıp tarayıcınızın adres çubuğuna yapıştırın: -#${verificationUrl} -email.verify.1=16 haneli ORCID tanımlayıcınız -#${orcid} -email.verify.2=ve ORCID kimliğinizin tamamı ve genel kaydınızın bağlantısı: -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=(birincil e-posta adresi: -email.verify.primary_email_2=) -email.verify.if_you_did_not=Bu e-posta adresini ORCID kaydınıza eklemediyseniz lütfen bu e-postayı yanıtlayarak hemen bizimle iletişime geçin. +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_uk.properties b/orcid-core/src/main/resources/i18n/email_verify_uk.properties index 69a2151878f..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_uk.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_uk.properties @@ -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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_xx.properties b/orcid-core/src/main/resources/i18n/email_verify_xx.properties index 77724dad145..622ade0700a 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_xx.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_xx.properties @@ -1,9 +1,3 @@ -email.verify.primary_reminder_v2=X -email.verify.primary_reminder=X -email.verify.thank_you=X -email.verify.thank_you_button=X -email.verify.1=X -email.verify.2=X -email.verify.primary_email_1=X -email.verify.primary_email_2=X -email.verify.if_you_did_not=X +email.verify.hi=X +email.verify.primary.reminder=X +email.verify.alternate.reminder=X \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_zh_CN.properties b/orcid-core/src/main/resources/i18n/email_verify_zh_CN.properties index ca1d157c28c..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_zh_CN.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_zh_CN.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=此邮件提醒您，需要先验证主邮箱地址，然后才能开始手动将所属机构、经历、关键字等信息添加到您的 ORCID 记录。 -email.verify.primary_reminder=此邮件提醒您，需要先验证主邮箱地址，然后才能开始手动将信息添加到您的 ORCID 记录。 -email.verify.thank_you=要验证您的邮箱地址，请使用以下链接并登录您的 ORCID 记录，如果无法单击该链接，请将其复制并粘贴到浏览器地址栏： -email.verify.thank_you_button=要验证您的电子邮箱地址，请单击以下按钮并登录到您的 ORCID 记录。如果您无法单击该按钮，请将其复制并粘贴到浏览器的地址栏： -#${verificationUrl} -email.verify.1=您的 16 位 ORCID 标识符是 -#${orcid} -email.verify.2=，您的完整 ORCID iD 号以及指向公开记录的链接是 -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=（主要电子邮箱地址： -email.verify.primary_email_2=) -email.verify.if_you_did_not=如果您没有将此电子邮箱地址添加到您的 ORCID 记录，请立即通过回复此电子邮件与我们联系。 +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_verify_zh_TW.properties b/orcid-core/src/main/resources/i18n/email_verify_zh_TW.properties index d876335d9e3..330dbba7088 100644 --- a/orcid-core/src/main/resources/i18n/email_verify_zh_TW.properties +++ b/orcid-core/src/main/resources/i18n/email_verify_zh_TW.properties @@ -1,17 +1,8 @@ #verification_email.ftl ################################################# -## Used on: +## Used on: # verification_email -email.verify.primary_reminder_v2=提醒您，您需要先驗證您的主要電子郵件地址，然後才能開始將資訊（如您的從屬機構、簡介或關鍵字）手動添加到您的 ORCID 記錄。 -email.verify.primary_reminder=提醒您，您需要先驗證您的主要電子郵件地址，然後才能開始手動添加資訊到您的 ORCID 記錄。 -email.verify.thank_you=欲驗證您的電子郵件地址，請點擊以下連結並登入您的 ORCID 記錄。如果您無法點擊該連結，請將其複製並貼到瀏覽器的網址列上： -email.verify.thank_you_button=欲驗證您的電子郵件地址，請點擊下方的按鈕並且登入您的 ORCID 記錄。如果您無法點擊該按鈕，請將下面的連結複製並貼到瀏覽器上的網址列上： -#${verificationUrl} -email.verify.1=您的 16 位數 ORCID 識別碼為 -#${orcid} -email.verify.2=，而您的完整 ORCID iD 和連結至您的公開記錄之連結為 -#${pubBaseUri}/${orcid} -email.verify.primary_email_1=（主要電子郵件地址： -email.verify.primary_email_2=） -email.verify.if_you_did_not=如果您並未將本電子郵件地址添加到您的 ORCID 記錄，請立即回覆本電子郵件以聯絡我們。 +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. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_ar.properties b/orcid-core/src/main/resources/i18n/email_welcome_ar.properties index 5525e705b0b..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_ar.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_ar.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=شكرًا لك على إنشاء معرِّف أوركيد الخاص بك. يرجى التحقق من عنوان بريدك الإلكتروني لإكمال التسجيل والحصول على حق الوصول لتعديل السجل يدويًا: انقر فوق الرابط التالي وقم بتسجيل الدخول إلى سجل أوركيد الخاص بك. إذا لم تتمكن من النقر فوق الرابط، فقم بنسخه ولصقه في شريط عنوان المتصفح. -email.button=تحقق من عنوان بريدك الإلكتروني -email.welcome.your_id.id=معرِّف أوركيد المكون من 16 رقمًا هو -email.welcome.your_id.link=، ومعرِّف أوركيد الكامل الخاص بك والرابط إلى سجلك العام هو -email.welcome.next_steps=الخطوات التالية: -email.welcome.next_steps.1=1. أضف المزيد من المعلومات إلى سجل أوركيد الخاص بك -email.welcome.next_steps.1.description.1.1=قم بالوصول إلى سجل أوركيد الخاص بك على -email.welcome.next_steps.1.description.1.2=وإضافة المزيد من المعلومات إلى سجلك. إذا لم تكن قد قمت بذلك بالفعل، فإننا نوصي بشدة بإضافة أكثر من عنوان بريد إلكتروني إلى حسابك، نظرًا لأن نظامنا يتحقق من الأسماء وعناوين البريد الإلكتروني لمنع إنشاء سجلات مكررة. -email.welcome.next_steps.1.description.2=يستخدم المموّلون والناشرون والجامعات وغيرهم المعلومات الموجودة في سجل أوركيد للمساعدة في تقليل حفظ السجلات التي يطلبونها منك. قم بزيادة المعلومات التي يمكنك مشاركتها عن طريق إضافة أسماء أخرى معروفة لديك، والمعلومات المهنية مثل الانتماء، والسيرة الذاتية، والكلمات المفتاحية، والتمويل الذي تلقيته، والأعمال التي قمت بإنشائها أو ساهمت فيها إلى سجلك. -email.welcome.next_steps.1.description.tips=للحصول على نصائح حول إضافة معلومات إلى سجل أوركيد، انظر: -email.welcome.next_steps.1.description.tips.1=اطلعْ على نصائحنا بشأن -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you٪E2٪80٪99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=ستة أشياء يجب القيام بها الآن بعد أن أصبح لديك معرِّف أوركيد -email.welcome.next_steps.1.description.tips.2=. للحصول على نصائح حول إضافة معلومات إلى سجلّ أوركيد الخاص بك، انظرْ: -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894\n -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. استخدم معرّف أوركيد الخاص بك عند النشر والتقدم بطلب للحصول على منح وغير ذلك -email.welcome.next_steps.2.description=تطلب العديد من الأنظمة معرِّف أوركيد الخاص بك من أجل إنشاء رابط بينك وبين مخرجات بحثك وارتباطاتك. سيساعدك استخدام معرِّف أوركيد الخاص بك، ومنح المنظمات الإذن لتحديث سجلك متى طلبوا ذلك، على الحصول على التقدير مقابل عملك وتقليل الوقت الذي تقضيه في حفظ السجلات في المستقبل. -email.welcome.need_help=تحتاج مساعدة؟ - -email.welcome.thank_you_for_creating=شكرًا لك على إنشاء معرّف ORCID. معرّف ORCID المكوّن من 16 رقمًا هو -email.welcome.full_orcid_and_link_public=، ومعرِّف أوركيد الكامل الخاص بك والرابط إلى سجلك العام هو -email.welcome.please_verify_your_email=يُرجى مراجعة عنوان بريدك الإلكتروني لاستكمال التسجيل والدخول لتحرير السجل يدويًا: انقر فوق الرابط التالي وقم بتسجيل الدخول إلى سجلك على ORCID. إذا لم تتمكن من النقر فوق الرابط، فانسخه والصقه في شريط عنوان المتصفح. -email.welcome.please_visit_your=يُرجى زيارة -email.welcome.researcher_homepage=الصفحة الرئيسية للباحث -email.welcome.for_more_information=للحصول على مزيد من المعلومات حول كيفية تحقيق أقصى استفادة من سجلك على ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_ca.properties b/orcid-core/src/main/resources/i18n/email_welcome_ca.properties index c0d7e66c198..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_ca.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_ca.properties @@ -1,54 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Thank you for creating your ORCID identifier. 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.button=Verify your email address -email.welcome.your_id.id=Your 16-digit ORCID identifier is -email.welcome.your_id.link=, and your full ORCID iD and the link to your public record is -email.welcome.next_steps=Next steps: -email.welcome.next_steps.1=1. Add more information to your ORCID Record -email.welcome.next_steps.1.description.1.1=Access your ORCID record at -email.welcome.next_steps.1.description.1.2=and add more information to your record. If you haven't already done so, we strongly recommend that you add more than one email address to your account, since our system checks names and email addresses to prevent the creation of duplicate records. -email.welcome.next_steps.1.description.2=Funders, publishers, universities, and others use the information contained in your ORCID record to help reduce the record-keeping they ask from you. Increase the information you can share by adding other names you are known by, professional information such as your affiliation, biography, and keywords, funding you have received, and works you have created or contributed to your record. -email.welcome.next_steps.1.description.tips=For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.tips.1=See our tips for -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=six things to do now that you have an ORCID iD -email.welcome.next_steps.1.description.tips.2=. For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -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=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_cs.properties b/orcid-core/src/main/resources/i18n/email_welcome_cs.properties index b57f931bc29..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_cs.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_cs.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Děkujeme, že jste vytvořili svůj ORCID identifikátor. Chcete-li dokončit registraci a získat přístup k manuální úpravě záznamu, ověřte prosím svou e-mailovou adresu: klikněte na následující odkaz a přihlaste se do svého ORCID záznamu. Pokud na odkaz nemůžete kliknout, zkopírujte jej a vložte do adresního řádku vašeho prohlížeče. -email.button=Ověřte svou e-mailovou adresu -email.welcome.your_id.id=Váš 16místný identifikátor ORCID je -email.welcome.your_id.link=a váš kompletní ORCID iD a odkaz na váš veřejný záznam je -email.welcome.next_steps=Další kroky: -email.welcome.next_steps.1=1. Přidejte více informací do svého ORCID záznamu -email.welcome.next_steps.1.description.1.1=Získejte přístup ke svému ORCID záznamu na adrese -email.welcome.next_steps.1.description.1.2=a přidat do záznamu další informace. Pokud jste tak dosud neučinili, důrazně doporučujeme, abyste ke svému účtu přidali více než jednu e-mailovou adresu, protože náš systém kontroluje jména a e-mailové adresy, aby zabránil vytváření duplicitních záznamů. -email.welcome.next_steps.1.description.2=Financující subjekty, vydavatelé, univerzity a další používají informace obsažené ve vašem záznamu ORCID ke snížení počtu záznamů, které od vás vyžadují. Zvyšte objem informací, které můžete sdílet, přidáním dalších jmen, pod kterými jste známí, profesionálních informací, jako jsou vaše afiliace, biografie a klíčová slova, financování, které jste obdrželi, a publikací, které jste vytvořili nebo k nimž jste přispěli. -email.welcome.next_steps.1.description.tips=Tipy pro přidávání informací do vašeho ORCID záznamu najdete na: -email.welcome.next_steps.1.description.tips.1=Podívejte se na naše tipy pro -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=Šest věcí, které musíte udělat, když máte ORCID iD -email.welcome.next_steps.1.description.tips.2=Pro tipy, jak přidat informace do svého záznamu ORCID, se podívejte na: -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Používejte své ORCID iD při vydávání publikací, žádostech o granty a dalších úkonech -email.welcome.next_steps.2.description=Mnoho systémů žádá o váš ORCID iD, aby vytvořilo spojení mezi vámi a vašimi výzkumnými výstupy a přidruženími. Používání vašeho ORCID iD a udělení oprávnění organizacím aktualizovat váš záznam, kdykoli o to požádají, vám pomůže získat uznání za vaši práci a zkrátit čas strávený budoucím vedením záznamů. -email.welcome.need_help=Potřebujete pomoc? - -email.welcome.thank_you_for_creating=Děkujeme vám za vytvoření identifikátoru ORCID. Váš 16místný identifikátor ORCID je -email.welcome.full_orcid_and_link_public=, a svým úplným ORCID iD a odkaz na váš veřejný záznam je -email.welcome.please_verify_your_email=Chcete-li dokončit registraci a získat přístup k úpravám svého účtu, ověřte svou e-mailovou adresu: klikněte na následující odkaz a přihlaste se do svého účtu ORCID. Pokud na odkaz nemůžete kliknout, zkopírujte jej a vložte do adresního řádku vašeho prohlížeče. -email.welcome.please_visit_your=Navštivte naši -email.welcome.researcher_homepage=domovskou stránku pro vědecké pracovníky -email.welcome.for_more_information=pro další informace o tom, jak svůj účet ORCID co nejlépe využít. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_de.properties b/orcid-core/src/main/resources/i18n/email_welcome_de.properties index 8f1352e5a87..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_de.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_de.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Vielen Dank für die Erstellung Ihrer ORCID-Kennung. Bitte bestätigen Sie Ihre E-Mail-Adresse, um Ihre Registrierung abzuschließen und Ihren Eintrag manuell bearbeiten zu können: 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.button=Bestätigen Sie Ihre E-Mail-Adresse -email.welcome.your_id.id=Ihre 16-stellige ORCID-Kennung lautet -email.welcome.your_id.link=und Ihre vollständige ORCID-iD und der Link zu Ihrem öffentlichen Eintrag -email.welcome.next_steps=Nächste Schritte: -email.welcome.next_steps.1=1. Fügen Sie Ihrem ORCID-Eintrag weitere Informationen hinzu -email.welcome.next_steps.1.description.1.1=Auf Ihren ORCID-Eintrag zugreifen können Sie unter -email.welcome.next_steps.1.description.1.2=und Ihrem Eintrag weitere Informationen hinzuzufügen. Falls Sie dies noch nicht getan haben, empfehlen wir Ihnen dringend, Ihrem Konto mehr als eine E-Mail-Adresse hinzuzufügen, da unser System Namen und E-Mail-Adressen überprüft, um die Erstellung doppelter Einträge zu verhindern. -email.welcome.next_steps.1.description.2=Finanzierer, Verlage, Universitäten und andere verwenden die in Ihrem ORCID-Eintrag enthaltenen Informationen, um die von Ihnen verlangte Dokumentation zu reduzieren. Erweitern Sie die Informationen, die Sie teilen können, indem Sie andere Namen hinzufügen, unter denen Sie bekannt sind, sowie berufliche Informationen wie Ihre Zugehörigkeit, Biografie und Schlüsselwörter, erhaltene Finanzierung und Werke, die Sie erstellt oder zu denen Sie beigetragen haben. -email.welcome.next_steps.1.description.tips=Tipps zum Hinzufügen von Informationen zu Ihrem ORCID-Eintrag finden Sie hier:\n -email.welcome.next_steps.1.description.tips.1=Lesen Sie unsere Tipps zu -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=sechs Dingen, die Sie jetzt tun sollten, da Sie nun eine ORCID iD haben -email.welcome.next_steps.1.description.tips.2=. Tipps zum Hinzufügen von Informationen zu Ihrem ORCID-Eintrag finden Sie hier:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Verwenden Sie Ihre ORCID iD, wenn Sie etwas veröffentlichen, sich auf Fördermittel bewerben und mehr -email.welcome.next_steps.2.description=Viele Systeme fragen nach Ihrer ORCID-iD, um eine Verbindung zwischen Ihnen und Ihren Forschungsergebnissen und Zugehörigkeiten herzustellen. Wenn Sie Ihre ORCID-iD verwenden und Organisationen die Erlaubnis erteilen, Ihre Aufzeichnungen zu aktualisieren, wann immer sie dies verlangen, können Sie Ihre Werk zugeschrieben bekommen und den Zeitaufwand für zukünftige Aufzeichnungen reduzieren. -email.welcome.need_help=Brauchen Sie Hilfe? - -email.welcome.thank_you_for_creating=Vielen Dank für die Erstellung Ihrer ORCID-Kennung. Ihre 16-stellige ORCID-Kennung lautet -email.welcome.full_orcid_and_link_public=und Ihre vollständige ORCID-iD und der Link zu Ihrem öffentlichen Eintrag -email.welcome.please_verify_your_email=Bitte bestätigen Sie Ihre E-Mail-Adresse, um Ihre Registrierung abzuschließen und Zugang zur manuellen Bearbeitung Ihres Eintrags zu erhalten: Klicken Sie auf den folgenden Link und melden Sie sich bei Ihrem ORCID-Eintrag an. Wenn Sie den Link nicht anklicken können, kopieren Sie ihn und fügen Sie ihn in die Adressleiste Ihres Browsers ein. -email.welcome.please_visit_your=Bitte besuchen Sie unsere -email.welcome.researcher_homepage=Forscher-Homepage, -email.welcome.for_more_information=um weitere Informationen darüber zu erhalten, wie Sie das Maximum aus Ihrem ORCID-Eintrag herausholen können. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file 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 cd9ffc14be1..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_en.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_en.properties @@ -6,56 +6,14 @@ # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Thank you for creating your ORCID identifier. 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.button=Verify your email address -email.welcome.your_id.id=Your 16-digit ORCID identifier is -email.welcome.your_id.link=, and your full ORCID iD and the link to your public record is -email.welcome.next_steps=Next steps: -email.welcome.next_steps.1=1. Add more information to your ORCID Record -email.welcome.next_steps.1.description.1.1=Access your ORCID record at -email.welcome.next_steps.1.description.1.2=and add more information to your record. If you haven't already done so, we strongly recommend that you add more than one email address to your account, since our system checks names and email addresses to prevent the creation of duplicate records. -email.welcome.next_steps.1.description.2=Funders, publishers, universities, and others use the information contained in your ORCID record to help reduce the record-keeping they ask from you. Increase the information you can share by adding other names you are known by, professional information such as your affiliation, biography, and keywords, funding you have received, and works you have created or contributed to your record. -email.welcome.next_steps.1.description.tips=For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.tips.1=See our tips for -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=six things to do now that you have an ORCID iD -email.welcome.next_steps.1.description.tips.2=. For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -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_homepage=researcher homepage +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_es.properties b/orcid-core/src/main/resources/i18n/email_welcome_es.properties index 066ea385559..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_es.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_es.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Gracias por crear tu identificador ORCID. Verifique tu dirección de correo electrónico para completar tu registro y obtener acceso para editar tu registro manualmente: has clic en el enlace a continuación e inicia sesión en tu registro ORCID. Si no puede hacer clic en el enlace, copia y pégalo en la barra de direcciones de tu navegador. -email.button=Verifica tu dirección de correo electrónico -email.welcome.your_id.id=Tu identificador ORCID de 16 dígitos es -email.welcome.your_id.link=, y tu ORCID iD completo y el enlace a tu registro público es -email.welcome.next_steps=Próximos pasos: -email.welcome.next_steps.1=1. Añade más información a tu Registro ORCID -email.welcome.next_steps.1.description.1.1=Accede a tu registro ORCID en -email.welcome.next_steps.1.description.1.2=y añade más información a tu registro. Si no lo has hecho todavía, recomendamos encarecidamente que añadas más de una dirección de correo electrónico a tu cuenta, ya que nuestro sistema comprueba nombres y direcciones de correo electrónico para evitar la creación de registros duplicados. -email.welcome.next_steps.1.description.2=Los financiadores, las editoriales, las universidades y otras entidades utilizan la información contenida en tu registro ORCID para ayudar a reducir el llenado de formatos que ellos te solicitan. Aumenta la información que puedes compartir al añadir a tu registro otros nombres por los que te le conoce, información profesional como afiliación, biografía y palabras clave, el financiamiento que has recibido y los trabajos que has creado o en los que has contribuido. -email.welcome.next_steps.1.description.tips=Para obtener sugerencias sobre cómo añadir información a tu registro ORCID, consulta: -email.welcome.next_steps.1.description.tips.1=Consulta nuestras sugerencias para -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=seis cosas que debes hacer ahora que tienes un ORCID iD -email.welcome.next_steps.1.description.tips.2=. Para ver consejos sobre cómo añadir información a tu registro ORCID, ve: -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Utiliza tu ORCID iD al publicar, solicitar financiamiento y más -email.welcome.next_steps.2.description=Muchos sistemas piden tu ORCID iD para crear un vínculo entre tú y tus trabajos de investigación así como tus afiliaciones. Utiliza tu ORCID iD y otorga a los diferentes organismos permiso para actualizar tu registro cada vez que lo soliciten, te ayudará a conseguir crédito por tu trabajo y ayudará a reducir el tiempo que invertirás llenando formatos en diferentes sistemas en el futuro. -email.welcome.need_help=¿Necesitas ayuda? - -email.welcome.thank_you_for_creating=Gracias por crear su identificador ORCID. Su identificador ORCID de 16 dígitos es -email.welcome.full_orcid_and_link_public=, y tu ORCID iD completo y el enlace a tu registro público es -email.welcome.please_verify_your_email=Verifique su dirección de correo electrónico para terminar de registrarse y poder editar el registro manualmente. Para ello, haga clic en el enlace que aparece a continuación e inicie sesión en su registro ORCID. Si no puede hacer clic en el enlace, cópielo y péguelo en la barra de direcciones del navegador. -email.welcome.please_visit_your=Visite nuestra -email.welcome.researcher_homepage=página de inicio para investigadores -email.welcome.for_more_information=para obtener más información sobre cómo sacarle el máximo partido a su registro ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_fr.properties b/orcid-core/src/main/resources/i18n/email_welcome_fr.properties index e82a0a5f17f..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_fr.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_fr.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Merci d'avoir créé votre identifiant ORCID. Veuillez vérifier votre adresse e-mail pour terminer votre inscription et obtenir l'accès pour modifier manuellement votre dossier : cliquez sur le lien suivant et connectez-vous à votre dossier ORCID. Si vous ne pouvez pas cliquer sur le lien, copiez et collez-le dans la barre d'adresse de votre navigateur.\n -email.button=Vérifier votre adresse e-mail\n -email.welcome.your_id.id=Votre identifiant ORCID à 16 chiffres est -email.welcome.your_id.link=, et votre iD d'ORCID complet ainsi que le lien vers votre dossier public est\n -email.welcome.next_steps=Prochaines étapes :\n -email.welcome.next_steps.1=1. Ajouter plus d'informations à votre dossier ORCID\n -email.welcome.next_steps.1.description.1.1=Accédez à votre dossier ORCID à\n -email.welcome.next_steps.1.description.1.2=et ajouter des informations supplémentaires à votre dossier. Si vous ne l'avez pas encore fait, nous vous recommandons vivement d'ajouter plus d'une adresse e-mail à votre compte, car notre système vérifie les noms et les adresses e-mail pour éviter la création de dossiers en double.\n -email.welcome.next_steps.1.description.2=Les bailleurs de fonds, les éditeurs, les universités et autres utilisent les informations contenues dans votre dossier ORCID pour réduire le nombre de dossiers qu'ils vous demandent. Augmentez les informations que vous pouvez partager en ajoutant à votre dossier d'autres noms sous lesquels vous êtes connu, des informations professionnelles telles que votre affiliation, votre biographie et vos mots-clés, les financements que vous avez reçus et les travaux que vous avez créés ou auxquels vous avez contribué. -email.welcome.next_steps.1.description.tips=Pour obtenir des conseils sur l'ajout d'informations à votre dossier ORCID, consultez :\n -email.welcome.next_steps.1.description.tips.1=Consultez nos conseils pour -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id\n -email.welcome.next_steps.1.description.tips.1.link.text=six choses à faire maintenant que vous avez un iD d'ORCID\n -email.welcome.next_steps.1.description.tips.2=. Pour obtenir des conseils sur l'ajout d'informations à votre dossier ORCID, consultez :\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Utilisez votre iD d'ORCID pour publier, demander des subventions, etc.\n -email.welcome.next_steps.2.description=De nombreux systèmes demandent votre identifiant ORCID afin de créer un lien entre vous et vos résultats de recherche et affiliations. En utilisant votre iD d'ORCID et en autorisant les organisations à mettre à jour votre dossier chaque fois qu'elles en font la demande, vous pourrez être récompensé pour votre travail et réduire le temps consacré à la tenue des dossiers. -email.welcome.need_help=Besoin d'aide ? - -email.welcome.thank_you_for_creating=Merci d'avoir créé votre identifiant ORCID. Votre identifiant ORCID à 16 chiffres est -email.welcome.full_orcid_and_link_public=, et votre identifiant ORCID complet ainsi que le lien vers votre dossier public sont -email.welcome.please_verify_your_email=Confirmez votre adresse e-mail pour finaliser votre inscription et accéder à votre dossier pour le modifier manuellement : cliquez sur le lien suivant et connectez-vous à votre dossier ORCID. Si vous ne pouvez pas cliquer sur le lien, copiez-le et collez-le dans la barre d'adresse de votre navigateur. -email.welcome.please_visit_your=Consultez notre -email.welcome.researcher_homepage=page d'accueil pour les chercheurs -email.welcome.for_more_information=pour savoir comment exploiter pleinement votre dossier ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_id.properties b/orcid-core/src/main/resources/i18n/email_welcome_id.properties index c0d7e66c198..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_id.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_id.properties @@ -1,54 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Thank you for creating your ORCID identifier. 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.button=Verify your email address -email.welcome.your_id.id=Your 16-digit ORCID identifier is -email.welcome.your_id.link=, and your full ORCID iD and the link to your public record is -email.welcome.next_steps=Next steps: -email.welcome.next_steps.1=1. Add more information to your ORCID Record -email.welcome.next_steps.1.description.1.1=Access your ORCID record at -email.welcome.next_steps.1.description.1.2=and add more information to your record. If you haven't already done so, we strongly recommend that you add more than one email address to your account, since our system checks names and email addresses to prevent the creation of duplicate records. -email.welcome.next_steps.1.description.2=Funders, publishers, universities, and others use the information contained in your ORCID record to help reduce the record-keeping they ask from you. Increase the information you can share by adding other names you are known by, professional information such as your affiliation, biography, and keywords, funding you have received, and works you have created or contributed to your record. -email.welcome.next_steps.1.description.tips=For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.tips.1=See our tips for -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=six things to do now that you have an ORCID iD -email.welcome.next_steps.1.description.tips.2=. For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -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=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_it.properties b/orcid-core/src/main/resources/i18n/email_welcome_it.properties index 1050458ae3c..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_it.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_it.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Grazie per aver creato il tuo ORCID iD. Verifica il tuo indirizzo email per completare la registrazione e ottenere l'accesso per modificare manualmente il tuo fascicolo: fai clic sul seguente collegamento e accedi al tuo record ORCID. Se non riesci a fare clic sul collegamento, copialo e incollalo nella barra degli indirizzi del browser. -email.button=Verifica il tuo indirizzo email\n -email.welcome.your_id.id=Il tuo ORCID iD di 16 cifre è -email.welcome.your_id.link=, e il tuo ORCID iD completo e il collegamento al tuo fascicolo pubblico sono -email.welcome.next_steps=Fasi successive: -email.welcome.next_steps.1=1. Aggiungi altre informazioni al tuo record ORCID\n -email.welcome.next_steps.1.description.1.1=Accedi al tuo record ORCID su\n -email.welcome.next_steps.1.description.1.2=e aggiungi altre informazioni al tuo record. Se non l'hai già fatto, ti raccomandiamo vivamente di aggiungere più di un indirizzo email al tuo account, dato che il nostro sistema controlla i nomi e gli indirizzi email per evitare la creazione di record duplicati.\n -email.welcome.next_steps.1.description.2=I finanziatori, gli editori, le università e altri usano le informazioni contenute nel tuo record ORCID per aiutarti a ridurre il lavoro di registrazione che ti chiedono. Aumenta le informazioni che puoi condividere aggiungendo al tuo record altri nomi con cui sei conosciuto, informazioni professionali come la tua affiliazione, biografia e parole chiave, finanziamenti che hai ricevuto e lavori che hai creato o a cui hai contribuito.\n -email.welcome.next_steps.1.description.tips=Per ottenere consigli su come aggiungere informazioni al tuo record ORCID, consulta:\n -email.welcome.next_steps.1.description.tips.1=Vedi i nostri consigli per\n -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=sei cose da fare ora che disponi di un ORCID iD -email.welcome.next_steps.1.description.tips.2=. Per consigli su come aggiungere informazioni al tuo record ORCID vedi:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894\n -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Usa il tuo ORCID iD quando pubblichi, chiedi sovvenzioni e altro\n -email.welcome.next_steps.2.description=Molti sistemi richiedono il tuo ORCID iD per creare un collegamento tra te e i tuoi risultati di ricerca e affiliazioni. Usare il tuo ORCID iD e permettere alle organizzazioni di aggiornare il tuo fascicolo ogni volta che lo richiedono ti aiuterà a ottenere il riconoscimento del tuo lavoro e a ridurre il tempo speso per il futuro mantenimento dei registri. -email.welcome.need_help=Hai bisogno di aiuto?\n - -email.welcome.thank_you_for_creating=Grazie di aver creato il tuo identificativo ORCID. Il tuo identificativo ORCID di 16 cifre è -email.welcome.full_orcid_and_link_public=, e il tuo iD di ORCID completo e il link al tuo record pubblico è -email.welcome.please_verify_your_email=Verifica il tuo indirizzo email per completare la registrazione e avere accesso alla modifica manuale dei tuoi dati: clicca sul link seguente e accedi al tuo profilo ORCID. Se non riesci a cliccare sul link, copialo e incollalo nella barra degli indirizzi del browser. -email.welcome.please_visit_your=Vai alla nostra -email.welcome.researcher_homepage=homepage dei ricercatori -email.welcome.for_more_information=per maggiori informazioni su come ottenere il massimo dal tuo profilo ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_ja.properties b/orcid-core/src/main/resources/i18n/email_welcome_ja.properties index 0180bfc6eeb..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_ja.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_ja.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=ORCID識別子を作成していただきありがとうございます。メールアドレスの認証を行って登録を完了し、レコードを手動で編集するためのアクセス権を取得してください： 以下のリンクをクリックし、ORCIDレコードにサインインしてください。リンクをクリックできない場合は、リンクをコピーしてブラウザのアドレスバーに貼り付けてください。 -email.button=メールアドレスを認証してください -email.welcome.your_id.id=あなたの16桁のORCID識別子は以下の通りです -email.welcome.your_id.link=、および完全なORCID iDと公開レコードへのリンクは -email.welcome.next_steps=次のステップ： -email.welcome.next_steps.1=1.ORCIDレコードに情報を追加 -email.welcome.next_steps.1.description.1.1=ORCIDレコードにアクセス： -email.welcome.next_steps.1.description.1.2=あなたのレコードにさらに情報を追加します。まだ行っていない場合は、アカウントに複数のメールアドレスを追加することを強くおすすめします。システムが名前とメールアドレスをチェックし、重複するレコードが作成されないようにするためです。 -email.welcome.next_steps.1.description.2=資金提供者、出版社、大学などは、あなたのORCIDレコードに含まれる情報を使用し、あなたに求める記録管理を削減するのに役立てます。あなたが知っている他の著名な人物、あなたの所属、経歴、キーワードなどの専門的な情報、あなたが受け取った資金、およびあなたが作成またはレコードに貢献した仕事を追加することによって、共有できる情報を増やしてください。 -email.welcome.next_steps.1.description.tips=ORCIDレコードに情報を追加するためのヒントについては、以下を参照してください： -email.welcome.next_steps.1.description.tips.1=ヒントをご覧ください -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=ORCID iDを入手した今やるべき6つのこと -email.welcome.next_steps.1.description.tips.2=。 ORCIDレコードに情報を追加するためのヒントについては、以下を参照してください： -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. 公開、助成金の申請などの際にORCID iDを使用する -email.welcome.next_steps.2.description=多くのシステムは、あなたとあなたの研究成果および所属との間にリンクを作成するために、ORCID iDを要求します。ORCID iDを使用し、組織が要求するたびにレコードを更新する許可を組織に与えると、あなたの仕事の功績を認められ、将来の記録管理に費やす時間を削減することができます。 -email.welcome.need_help=サポートが必要ですか？ - -email.welcome.thank_you_for_creating=ORCID識別子を作成いただきありがとうございます。お客様の16桁のORCID識別子はこちらです: -email.welcome.full_orcid_and_link_public=、および完全なORCID iDと公開記録へのリンクは -email.welcome.please_verify_your_email=メールアドレスの認証を行って登録を完了し、レコードを手動で編集するためのアクセス権を取得してください： 以下のリンクをクリックし、ORCIDレコードにサインインしてください。リンクをクリックできない場合は、リンクをコピーしてブラウザのアドレスバーに貼り付けてください。 -email.welcome.please_visit_your=以下にアクセスしてください -email.welcome.researcher_homepage=研究者ホームページ -email.welcome.for_more_information=ORCIDレコードの活用法についての詳細をご覧いただけます。 +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_ko.properties b/orcid-core/src/main/resources/i18n/email_welcome_ko.properties index d50b8a38539..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_ko.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_ko.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=ORCID 식별자 생성에 감사드립니다. 이메일을 확인하여 귀하의 등록 절차를 완료해 레코드를 수동으로 편집할 수 있는 접근 권한을 받으십시오. 다음 링크를 클릭해 귀하의 ORCID 레코드에 로그인하십시오. 링크를 클릭할 수 없는 경우에는 브라우저의 주소창에 링크를 복사 붙여넣기 하십시오. -email.button=이메일 주소를 확인합니다 -email.welcome.your_id.id=귀하의 16자리 ORCID 식별자는 -email.welcome.your_id.link=, 그리고 귀하의 전체 ORCID iD와 공개 레코드에 대한 링크는 다음과 같습니다. -email.welcome.next_steps=다음 단계: -email.welcome.next_steps.1=1. 귀하의 ORCID 레코드에 정보를 더하십시오 -email.welcome.next_steps.1.description.1.1=귀하의 ORCID 레코드에 접속 -email.welcome.next_steps.1.description.1.2=그리고 귀하의 레코드에 더 많은 정보를 더하십시오. 시스템이 중복 레코드 생성을 막기 위해 이름과 이메일 주소를 확인하기 때문에 이미 더하지 않으셨다면 귀하의 계정에 1개 이상의 이메일 주소를 더할 것을 강력하게 추천합니다. -email.welcome.next_steps.1.description.2=귀하의 ORCID 레코드에 포함된 귀하의 정보를 이용하는 기금 제공자, 퍼블리셔, 대학, 기타 주체들은 귀하에게 요청하는 레코드 기록보관을 줄일 수 있도록 도움을 줍니다. 귀하가 알고 있는 이름들, 소속기관, 바이오그래피, 키워드, 수여받은 연구 기금, 작성하거나 기여한 저작물 같은 전문적인 정보 등을 더해 공유하는 정보의 양을 늘리십시오. -email.welcome.next_steps.1.description.tips=ORCID 레코드에 정보를 추가하는 방법은 다음을 참조하십시오. -email.welcome.next_steps.1.description.tips.1=다음에 대한 팁을 참조하십시오 -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=ORCID iD로 할 수 있는 6가지 일들 -email.welcome.next_steps.1.description.tips.2=. ORCID 레코드 정보 추가 팁 보기: -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. 게시, 보조금 신청 등에 ORCID iD를 사용합니다 -email.welcome.next_steps.2.description=많은 시스템이 귀하, 귀하의 연구 결과, 소속기관 사이의 연결을 만들기 위해 귀하의 ORCID iD를 물어볼 것입니다. 귀하의 ORCID iD를 이용하고 기관이 요청을 할 때마다 귀하의 레코드를 업데이트할 수 있는 권한을 허용하면 연구 업적을 인정받는 데 도움이 되고 레코드 업데이트에 필요한 시간을 단축해줄 것입니다. -email.welcome.need_help=도움이 필요하십니까? - -email.welcome.thank_you_for_creating=ORCID 식별자를 만들어주셔서 감사합니다. 귀하의 16자 ORCID 식별자: -email.welcome.full_orcid_and_link_public=, 그리고 귀하의 전체 ORCID iD와 공개 레코드에 대한 링크는 다음과 같습니다. -email.welcome.please_verify_your_email=이메일을 확인받아 등록이 완료되면 귀하의 레코드를 수동으로 편집하실 수 있습니다. 다음 링크를 클릭하여 ORCID 레코드에 로그인하십시오. 링크가 클릭되지 않으면 링크를 복사해 브라우저 주소창에 붙여넣으면 됩니다. -email.welcome.please_visit_your=ORCID 레코드를 최대한 활용하는 방법을 자세히 알아보려면 -email.welcome.researcher_homepage=연구자 홈페이지 -email.welcome.for_more_information=를 방문하십시오. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_pl.properties b/orcid-core/src/main/resources/i18n/email_welcome_pl.properties index 1f3c0e315c6..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_pl.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_pl.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Dziękujemy za utworzenie identyfikatora ORCID. Zweryfikuj swój adres e-mail, aby dokończyć rejestrację i uzyskać dostęp do ręcznej edycji rekordu: kliknij poniższe łącze i zaloguj się do rekordu ORCID. Jeśli nie możesz kliknąć łącza, skopiuj je i wklej w pasku adresu przeglądarki. -email.button=Zweryfikuj swój adres e-mail -email.welcome.your_id.id=Twój 16-cyfrowy identyfikator ORCID to -email.welcome.your_id.link=, a Twój pełny identyfikator ORCID i łącze do Twojego rekordu publicznego to -email.welcome.next_steps=Kolejne kroki: -email.welcome.next_steps.1=1. Dodaj więcej informacji do swojego rekordu ORCID -email.welcome.next_steps.1.description.1.1=Uzyskaj dostęp do swojego rekordu ORCID pod adresem -email.welcome.next_steps.1.description.1.2=i dodaj więcej informacji do swojego rekordu. Jeśli jeszcze tego nie zrobiono, zdecydowanie zalecamy dodanie więcej niż jednego adresu e-mail do konta, ponieważ nasz system sprawdza nazwiska i adresy e-mail, aby zapobiec tworzeniu zduplikowanych rekordów. -email.welcome.next_steps.1.description.2=Fundatorzy, wydawcy, uniwersytety i inne osoby wykorzystują informacje zawarte w Twoim rekordzie ORCID, aby pomóc Ci ograniczyć czas potrzebny na zarządzanie rekordem. Zwiększ liczbę informacji, które możesz udostępnić, dodając do swojego rekordu inne imiona i nazwiska, pod którymi jesteś znany(-a), informacje zawodowe, takie jak Twoje powiązania, biografię i słowa kluczowe, otrzymane fundusze oraz prace, których jesteś autorem(-ką) lub współtwórcą(-czynią). -email.welcome.next_steps.1.description.tips=Aby uzyskać wskazówki dotyczące dodawania informacji do rekordu ORCID, zapoznaj się z:\n -email.welcome.next_steps.1.description.tips.1=Zobacz nasze wskazówki dotyczące -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=sześć rzeczy, które warto zrobić, gdy masz już identyfikator ORCID -email.welcome.next_steps.1.description.tips.2=. Aby uzyskać wskazówki dotyczące dodawania informacji do rekordu ORCID, zobacz:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Używaj identyfikatora ORCID podczas publikowania, ubiegania się o granty i nie tylko -email.welcome.next_steps.2.description=Wiele systemów prosi o podanie identyfikatora ORCID, aby połączyć Cię a wynikami badań i powiązaniami. Korzystanie z identyfikatora ORCID i udzielanie organizacjom pozwolenia na aktualizowanie Twojego rekordu, kiedy o to poproszą, zapewni Ci odnotowanie Twojego wkładu pracę i skróci czas poświęcany na zarządzanie rekordem w przyszłości. -email.welcome.need_help=Potrzebujesz pomocy? - -email.welcome.thank_you_for_creating=Dziękujemy za utworzenie identyfikatora ORCID. Twój 16-cyfrowy identyfikator ORCID to -email.welcome.full_orcid_and_link_public=, a Twój pełny identyfikator ORCID i łącze do Twojego rekordu publicznego to -email.welcome.please_verify_your_email=Zweryfikuj swój adres e-mail, aby dokończyć rejestrację i uzyskać dostęp do ręcznej edycji rekordu: kliknij poniższe łącze i zaloguj się do rekordu ORCID. Jeśli nie możesz kliknąć łącza, skopiuj je i wklej w pasku adresu przeglądarki. -email.welcome.please_visit_your=Odwiedź naszą -email.welcome.researcher_homepage=stronę badacza, -email.welcome.for_more_information=aby uzyskać więcej informacji na temat tego, jak najlepiej wykorzystać rekord ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_pt.properties b/orcid-core/src/main/resources/i18n/email_welcome_pt.properties index 8ca426ee4b1..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_pt.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_pt.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Obrigado por ter criado o seu identificador ORCID. Verifique o seu endereço de correio eletrónico para completar o seu registo e obter acesso à edição manual do seu registo: clique na seguinte ligação e inicie sessão no seu registo ORCID. Caso não consiga clicar na ligação, copie-a e cole-a na barra de endereços do seu navegador. -email.button=Verifique o seu endereço de correio eletrónico -email.welcome.your_id.id=O seu identificador ORCID de 16 dígitos é -email.welcome.your_id.link=, e o seu iD ORCID iD completo e a ligação ao seu registo público é -email.welcome.next_steps=Próximos passos: -email.welcome.next_steps.1=1. Adicione mais informações ao seu registo ORCID -email.welcome.next_steps.1.description.1.1=Aceda ao seu registo ORCID em -email.welcome.next_steps.1.description.1.2=e acrescente mais informação ao seu registo. Se ainda não o fez, recomendamos fortemente que adicione mais do que um endereço de e-mail à sua conta, sendo que o nosso sistema verifica nomes e endereços de e-mail para prevenir a criação de registos duplicados. -email.welcome.next_steps.1.description.2=A informação incluída no seu registo ORCID é utilizada por financiadores, editores, universidades e outros para ajudar a reduzir a manutenção de registos que lhe é solicitada. Aumente a quantidade de informação que pode partilhar adicionando ao seu registo outros nomes pelo qual você é conhecido, informação pessoal, como a sua filiação, biografia, e palavras-chave, financiamento que tenha recebido, e projetos que tenha desenvolvido ou para os quais tenha contribuído. -email.welcome.next_steps.1.description.tips=Para saber como adicionar informação adicional ao seu registo ORCID, consulte: -email.welcome.next_steps.1.description.tips.1=Saiba quais são as nossas sugestões para -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=seis coisas a fazer agora que tem um iD ORCID -email.welcome.next_steps.1.description.tips.2=. Para saber como pode adicionar informação ao seu registo ORCID, consulte: -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Utilize o seu iD ORCID ao publicar, solicitar verbas, e muito mais -email.welcome.next_steps.2.description=Muitos sistemas pedem o seu iD ORCID de modo a criar uma ligação entre si e as instituições e resultados da sua investigação. Com o seu iD ORCID e concedendo às organizações autorização para atualizar o seu registo sempre que o solicitem, poderá ser creditado pelo seu trabalho e reduzir o tempo gasto na atualização futura de registos. -email.welcome.need_help=Precisa de ajuda? - -email.welcome.thank_you_for_creating=Obrigado por criar o seu identificador ORCID. O seu identificador ORCID de 16 dígitos é -email.welcome.full_orcid_and_link_public=, e o seu iD ORCID completo e a ligação para o seu registo público está -email.welcome.please_verify_your_email=Verifique o seu endereço de e-mail para completar o seu registo e obter acesso à edição manual do seu registo: clique na seguinte ligação e inicie sessão no seu registo ORCID. Caso não consiga clicar na ligação, copie-a e cole-a na barra de endereços do seu navegador. -email.welcome.please_visit_your=Visite a nossa -email.welcome.researcher_homepage=página inicial de investigador -email.welcome.for_more_information=para obter mais informações sobre como tirar o máximo partido do seu registo ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_rl.properties b/orcid-core/src/main/resources/i18n/email_welcome_rl.properties index 163a7515039..5190a16fe18 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_rl.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_rl.properties @@ -1,24 +1,11 @@ -email.welcome.thank_you.1=RL -email.welcome.thank_you.2=RL email.button=RL -email.welcome.click_link=RL -email.welcome.your_id.id=RL -email.welcome.your_id.link=RL -email.welcome.next_steps=RL -email.welcome.next_steps.1=RL -email.welcome.next_steps.1.description.1.1=RL -email.welcome.next_steps.1.description.1.2=RL -email.welcome.next_steps.1.description.2=RL -email.welcome.next_steps.1.description.tips=RL -email.welcome.next_steps.1.description.tips.1=RL -email.welcome.next_steps.1.description.tips.1.link.href=RL -email.welcome.next_steps.1.description.tips.1.link.text=RL -email.welcome.next_steps.1.description.tips.2=RL -email.welcome.next_steps.1.description.link.href=RL -email.welcome.next_steps.1.description.link.text=RL -email.welcome.next_steps.2=RL -email.welcome.next_steps.2.description=RL -email.welcome.need_help=RL -email.welcome.need_help.description=RL -email.welcome.need_help.description.link.href=RL -email.welcome.need_help.description.link.text=RL +email.welcome=RL +email.welcome.congrats=RL +email.welcome.for_more_information=RL +email.welcome.please_visit_our=RL +email.welcome.researcher_homepage=RL +email.welcome.verify.1=RL +email.welcome.verify.2=RL +email.welcome.verify.3=RL +email.welcome.verify.4=RL +email.welcome.visit=RL \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_ru.properties b/orcid-core/src/main/resources/i18n/email_welcome_ru.properties index a1d230ebe4f..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_ru.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_ru.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Благодарим вас за создание Вашего идентификатора ORCID. Подтвердите Ваш адрес электронной почты, чтобы завершить регистрацию и получить доступ к редактированию Вашей учетной записи: перейдите по следующей ссылке и войдите в Ваш личный кабинет ORCID. Если Вы не можете перейти по ссылке, то скопируйте и вставьте её в адресную строку вашего браузера. -email.button=Подтвердите свой адрес эл. почты -email.welcome.your_id.id=Ваш 16-значный идентификатор ORCID: -email.welcome.your_id.link=и Ваш полный идентификатор ORCID и ссылка на Ваш публичный профиль: -email.welcome.next_steps=Следующие шаги: -email.welcome.next_steps.1=1. Добавьте больше информации в свою учетную запись ORCID -email.welcome.next_steps.1.description.1.1=Вы можете войти в Вашу учетную запись ORCID по адресу: -email.welcome.next_steps.1.description.1.2=и добавьте больше информации в Ваш профиль. При возможности, мы настоятельно рекомендуем добавить дополнительный(-ые) адрес(-а) электронной почты в Ваш личный кабинет, поскольку наша система проверяет имена и адреса электронной почты для предотвращения создания дублирующих профилей. -email.welcome.next_steps.1.description.2=Спонсоры, издательства, университеты и другие организации используют информацию Вашей учетной записи ORCID, чтобы помочь уменьшить объем требующейся от Вас документации. Эта информация может включать в себя разновидности Вашего имени, данные профессиональной деятельности, образование, биографию, данные о финансировании и работы, которые Вы создали или внесли в Ваш профиль. -email.welcome.next_steps.1.description.tips=Советы по добавлению информации в Ваш профиль ORCID можно найти пройдя по следующей ссыкле:\n -email.welcome.next_steps.1.description.tips.1=Ознакомьтесь с нашими советами касательно -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=шесть вещей, которые можно сделать, имея идентификатор ORCID -email.welcome.next_steps.1.description.tips.2=. Советы по добавлению информации в Ваш профиль ORCID можно найти пройдя по следующей ссыкле:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Используйте Ваш идентификатор ORCID при опубликовании работ, подаче заявок на получение грантов и т.д. -email.welcome.next_steps.2.description=Многие системы просит идентификатор ORCID, чтобы создать связь между Вами, результатами Ваших исследований и Вашими аффилиациями. Предоставляя организациям возможность взаимодействовать с Вашей учетной записью ORCID поможет Вам получить признание за вашу работу и в будущем сократит затраты времени на ведение документации. -email.welcome.need_help=Нужна помощь? - -email.welcome.thank_you_for_creating=Ваш уникальный 16-значный идентификатор ORCID успешно создан. Он выглядит следующим образом: -email.welcome.full_orcid_and_link_public=и Ваш полный идентификатор ORCID и ссылка на Ваш публичный профиль: -email.welcome.please_verify_your_email=Подтвердите адрес электронной почты, чтобы завершить регистрацию и получить возможность редактировать профиль. Нажмите на ссылку, чтобы войти в личный кабинет ORCID. Если вам не удается перейти по ней, скопируйте адрес вручную. -email.welcome.please_visit_your=Посетите -email.welcome.researcher_homepage=главную страницу для научных сотрудников, -email.welcome.for_more_information=чтобы узнать, как пользоваться профилем ORCID. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_tr.properties b/orcid-core/src/main/resources/i18n/email_welcome_tr.properties index 53cc30f952d..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_tr.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_tr.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=ORCID tanımlayıcınızı oluşturduğunuz için teşekkür ederiz. Kaydınızı tamamlamak ve kaydınızı manuel olarak düzenlemek üzere erişim elde etmek için lütfen e-posta adresinizi doğrulayın: aşağıdaki bağlantıya tıklayın ve ORCID kaydınızda oturum açın. Bağlantıya tıklayamıyorsanız kopyalayıp tarayıcınızın adres çubuğuna yapıştırın. -email.button=E-posta adresinizi doğrulayın -email.welcome.your_id.id=16 haneli ORCID tanımlayıcınız -email.welcome.your_id.link=ve ORCID kimliğinizin tamamı ve genel kaydınızın bağlantısı: -email.welcome.next_steps=Sonraki adımlar: -email.welcome.next_steps.1=1. ORCID Kaydınıza daha fazla bilgi ekleyin -email.welcome.next_steps.1.description.1.1=ORCID kaydınıza şuradan erişin: -email.welcome.next_steps.1.description.1.2=ve kaydınıza daha fazla bilgi ekleyin. Henüz yapmadıysanız sistemimiz yinelenen kayıtların oluşturulmasını önlemek için adları ve e-posta adreslerini kontrol ettiği için mutlaka hesabınıza birden fazla e-posta adresi eklemenizi öneririz. -email.welcome.next_steps.1.description.2=Finansman sağlayıcılar, yayıncılar, üniversiteler ve diğerleri, ORCID kaydınızda yer alan bilgileri, sizden istedikleri kayıt tutmayı azaltmaya yardımcı olmak için kullanır. Tanıdığınız diğer isimleri, bağlantınız, biyografiniz ve anahtar kelimeleriniz gibi profesyonel bilgileri, aldığınız finansmanları, oluşturduğunuz veya katkıda bulunduğunuz eserleri kaydınıza ekleyerek paylaşabileceğiniz bilgileri artırın. -email.welcome.next_steps.1.description.tips=ORCID kaydınıza bilgi eklemeyle ilgili ipuçları için bkz:\n -email.welcome.next_steps.1.description.tips.1=Şunun için ipuçlarımıza bakın: -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=Bir ORCID kimliğiniz olduğuna göre şimdi yapmanız gereken altı şey -email.welcome.next_steps.1.description.tips.2=. ORCID kaydınıza bilgi eklemeyle ilgili ipuçları için bkz:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. Yayınlarken, hibe başvurusunda bulunurken ve daha fazlasını yaparken ORCID kimliğinizi kullanın -email.welcome.next_steps.2.description=Birçok sistem, sizinle araştırma çıktılarınız ve bağlantılarınız arasında bir bağlantı kurmak için ORCID kimliğinizi ister. ORCID kimliğinizi kullanmak ve kuruluşlara talep ettiklerinde kaydınızı güncelleme izni vermek, çalışmalarınız için kredi almanıza ve gelecekte kayıt tutarken harcanan zamanı azaltmanıza yardımcı olacaktır. -email.welcome.need_help=Yardıma mı İhtiyacınız Var? - -email.welcome.thank_you_for_creating=ORCID tanımlayıcınızı oluşturduğunuz için teşekkürler. 16 haneli ORCID tanımlayıcınız: -email.welcome.full_orcid_and_link_public=ve ORCID kimliğinizin tamamı ve genel kaydınızın bağlantısı: -email.welcome.please_verify_your_email=Kayıt işleminizi tamamlamak ve kaydınızı manuel olarak düzenleme erişimi kazanmak için lütfen e-posta adresinizi doğrulayın: aşağıdaki bağlantıya tıklayın ve ORCID kaydınıza giriş yapın. Bağlantıya tıklayamıyorsanız, bağlantı adresini kopyalayın ve tarayıcınızın adres çubuğuna yapıştırın. -email.welcome.please_visit_your=Lütfen şurayı ziyaret edin: -email.welcome.researcher_homepage=araştırmacı ana sayfası -email.welcome.for_more_information=böylece daha fazla bilgi edinebilir ORCID kaydınızdan en iyi şekilde yararlanabilirsiniz. +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_uk.properties b/orcid-core/src/main/resources/i18n/email_welcome_uk.properties index c0d7e66c198..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_uk.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_uk.properties @@ -1,54 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=Thank you for creating your ORCID identifier. 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.button=Verify your email address -email.welcome.your_id.id=Your 16-digit ORCID identifier is -email.welcome.your_id.link=, and your full ORCID iD and the link to your public record is -email.welcome.next_steps=Next steps: -email.welcome.next_steps.1=1. Add more information to your ORCID Record -email.welcome.next_steps.1.description.1.1=Access your ORCID record at -email.welcome.next_steps.1.description.1.2=and add more information to your record. If you haven't already done so, we strongly recommend that you add more than one email address to your account, since our system checks names and email addresses to prevent the creation of duplicate records. -email.welcome.next_steps.1.description.2=Funders, publishers, universities, and others use the information contained in your ORCID record to help reduce the record-keeping they ask from you. Increase the information you can share by adding other names you are known by, professional information such as your affiliation, biography, and keywords, funding you have received, and works you have created or contributed to your record. -email.welcome.next_steps.1.description.tips=For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.tips.1=See our tips for -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=six things to do now that you have an ORCID iD -email.welcome.next_steps.1.description.tips.2=. For tips on adding information to your ORCID record see:\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -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=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_xx.properties b/orcid-core/src/main/resources/i18n/email_welcome_xx.properties index 8ecae447d86..6b2627efea8 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_xx.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_xx.properties @@ -1,24 +1,11 @@ -email.welcome.thank_you.1=X -email.welcome.thank_you.2=X email.button=X -email.welcome.click_link=X -email.welcome.your_id.id=X -email.welcome.your_id.link=X -email.welcome.next_steps=X -email.welcome.next_steps.1=X -email.welcome.next_steps.1.description.1.1=X -email.welcome.next_steps.1.description.1.2=X -email.welcome.next_steps.1.description.2=X -email.welcome.next_steps.1.description.tips=X -email.welcome.next_steps.1.description.tips.1=X -email.welcome.next_steps.1.description.tips.1.link.href=X -email.welcome.next_steps.1.description.tips.1.link.text=X -email.welcome.next_steps.1.description.tips.2=X -email.welcome.next_steps.1.description.link.href=X -email.welcome.next_steps.1.description.link.text=X -email.welcome.next_steps.2=X -email.welcome.next_steps.2.description=X -email.welcome.need_help=X -email.welcome.need_help.description=X -email.welcome.need_help.description.link.href=X -email.welcome.need_help.description.link.text=X +email.welcome=X +email.welcome.congrats=X +email.welcome.for_more_information=X +email.welcome.please_visit_our=X +email.welcome.researcher_homepage=X +email.welcome.verify.1=X +email.welcome.verify.2=X +email.welcome.verify.3=X +email.welcome.verify.4=X +email.welcome.visit=X \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_zh_CN.properties b/orcid-core/src/main/resources/i18n/email_welcome_zh_CN.properties index 4adf2947914..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_zh_CN.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_zh_CN.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=感谢您注册 ORCID iD 号。为了完成注册过程并获得手动编辑记录的权限，验证您的电子邮箱地址：单击以下链接并登录您的 ORCID 记录。如果无法单击该链接，请将其复制并粘贴到浏览器地址栏中。 -email.button=验证您的电子邮箱地址 -email.welcome.your_id.id=您的 16 位 ORCID 标识符是 -email.welcome.your_id.link=，您的完整 ORCID iD 号以及指向公开记录的链接是 -email.welcome.next_steps=后续步骤： -email.welcome.next_steps.1=1. 为您的 ORCID 记录添加更多信息 -email.welcome.next_steps.1.description.1.1=访问您的 ORCID 记录 -email.welcome.next_steps.1.description.1.2=并向您的 ORCID 记录添加更多信息，由于我们的系统会检查名称和邮箱地址以防止创建重复记录，我们强烈建议您向账户添加多个邮箱地址。 -email.welcome.next_steps.1.description.2=资助者、出版商、大学和其他人使用您的 ORCID 记录中包含的信息，以帮助减少他们要求您保存记录的次数。增加您可以分享的信息，添加您的其他名字、专业信息（如您的隶属关系）、个人经历和关键词、您获得的资助、以及您创作或贡献的作品。 -email.welcome.next_steps.1.description.tips=有关向您的 ORCID 记录添加信息的提示，请参见：\n -email.welcome.next_steps.1.description.tips.1=请看我们的提示 -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=有了 ORCID iD 号后要做的六件事 -email.welcome.next_steps.1.description.tips.2=。有关向您的 ORCID 记录添加信息的提示，请参见：\n -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. 在发布、申请授权等活动中使用您的 ORCID iD 号 -email.welcome.next_steps.2.description=许多系统要求使用您的 ORCID iD 号来创建您与您的研究成果之间的链接。请使用 ORCID iD 号，并在组织请求时随时授予其更新您的记录的权限，以便获得工作信誉并减少未来的记录保存量。 -email.welcome.need_help=需要帮助？ - -email.welcome.thank_you_for_creating=感谢您创建 ORCID 标识符。您的 16 位 ORCID 标识符为 -email.welcome.full_orcid_and_link_public=，您的完整 ORCID iD 号以及指向公开记录的链接是 -email.welcome.please_verify_your_email=请验证您的电子邮件地址，以完成注册并获得手动编辑记录的权限：点击以下链接并登录您的 ORCID 记录。如果无法点击链接，请将其复制并粘贴到浏览器地址栏中。 -email.welcome.please_visit_your=请访问我们的 -email.welcome.researcher_homepage=研究者主页 -email.welcome.for_more_information=了解更多有关如何充分利用 ORCID 记录的信息。 +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/i18n/email_welcome_zh_TW.properties b/orcid-core/src/main/resources/i18n/email_welcome_zh_TW.properties index de44d738f16..4700f0ded31 100644 --- a/orcid-core/src/main/resources/i18n/email_welcome_zh_TW.properties +++ b/orcid-core/src/main/resources/i18n/email_welcome_zh_TW.properties @@ -1,61 +1,19 @@ # welcome_email_html.ftl ################################################# -## Used on: +## Used on: # welcome_email # admin actions # look-up-id-or-email-ng2-template - -#Dear ${emailName} -# -#Thank you for registering for an ORCID identifier through [client name]. To complete your registration please verify your email address. -# -#Or copy and paste this link into your browser's address bar: [verify link] -#Your ORCID iD is [16 digits] -#The link to your public record is [ORCID iD] -# -#Next steps: -# -#1. Add more information to your ORCID Record -# -#Access your ORCID record at ${baseUri}/my-orcid and add additional information to your record. -#Funders, publishers, universities and others use the information contained in an ORCID Record to help decrease the record keeping they ask from you. Increase the amount of information you can share in this way by adding other names you are known by, professional information, funding items you have received and works you have created to your Record. -# -#For tips on adding information to your ORCID record see: -#https://support.orcid.org/hc/articles/360006896894 -# -#2. Continue to use your ORCID iD -# -#May systems ask for your ORCID iD to create a link between you and your research outputs. Continue to use your ORCID iD whenever it is asked for to get credit for your work and decrease future record keeping. -# -#Need Help? -# -#If you have any questions or need help, contact the ORCID support team or visit https://support.orcid.org. -email.welcome.thank_you.1=感謝您創建您的 ORCID 識別碼。請驗證您的電子郵件地址以完成註冊，並且取得手動編輯您的記錄之權限：點擊以下連結並登入您的 ORCID 記錄。如果您無法點擊該連結，請將其複製並貼到瀏覽器的網址列上。 -email.button=確認您的郵件地址 -email.welcome.your_id.id=您的 16 位數 ORCID 識別碼為 -email.welcome.your_id.link=，而您的完整 ORCID iD 和連結至您的公開記錄之連結為 -email.welcome.next_steps=下一步： -email.welcome.next_steps.1=1. 添加更多資訊至您的 ORCID 記錄 -email.welcome.next_steps.1.description.1.1=存取您的 ORCID 記錄於 -email.welcome.next_steps.1.description.1.2=並且添加更多資訊到您的記錄中。如果您尚未添加多個電子郵件地址至您的帳戶，我們強烈建議您這麼做，因為我們的系統會檢查姓名和電子郵件地址，以避免創建重複的記錄。 -email.welcome.next_steps.1.description.2=資助方、出版商、大學和其他方使用您的 ORCID 記錄中包含的資訊來幫助減少他們要求您做的記錄保存。將您使用的其他名稱、專業資訊（如從屬機構、簡介和關鍵字）、您已獲得的補助金，以及您已創建或做出貢獻的研究添加到您的記錄以增加您可分享的資訊。 -email.welcome.next_steps.1.description.tips=關於在您的 ORCID 記錄中添加資訊的小提示，請參閱： -email.welcome.next_steps.1.description.tips.1=查看關於以下的提示： -email.welcome.next_steps.1.description.tips.1.link.href=https://orcid.org/blog/2015/07/23/six-things-do-now-you%E2%80%99ve-got-orcid-id -email.welcome.next_steps.1.description.tips.1.link.text=有了 ORCID iD 後，您現在該做的六件事 -email.welcome.next_steps.1.description.tips.2=。關於在您的 ORCID 記錄中添加資訊的小提示，請參閱： -email.welcome.next_steps.1.description.link.href=https://support.orcid.org/hc/articles/360006896894 -email.welcome.next_steps.1.description.link.text=https://support.orcid.org/hc/articles/360006896894 - -email.welcome.next_steps.2=2. 發表研究、申請補助金等等時，使用您的 ORCID iD -email.welcome.next_steps.2.description=許多系統都會要求您提供您的 ORCID iD，以在您與您的研究成果和從屬機構之間建立聯繫。使用您的 ORCID iD，並且在機構要求時授予其更新您的記錄之權限，將幫助您為您的研究取得引用積分，並且減少將來花在保存記錄上的時間。 -email.welcome.need_help=需要幫助嗎？ - -email.welcome.thank_you_for_creating=感謝您建立您的 ORCID 識別碼。您的 16 位數 ORCID 識別碼為 -email.welcome.full_orcid_and_link_public=，而您的完整 ORCID iD 和連結至您的公開記錄之連結為 -email.welcome.please_verify_your_email=請驗證您的電子郵件地址以完成註冊，並且取得手動編輯您的記錄之權限：點擊以下連結並登入您的 ORCID 記錄。如果您無法點擊該連結，請將其複製並貼到瀏覽器的網址列上。 -email.welcome.please_visit_your=請造訪我們的 -email.welcome.researcher_homepage=研究者主頁 -email.welcome.for_more_information=以了解更多關於如何充分利用您的 ORCID 記錄的資訊。 +email.button=Verify your email address +email.welcome=Welcome to ORCID +email.welcome.congrats=Congratulations on creating your new ORCID iD! This persistent digital identifier, that you own and control, will distinguish you from every other researcher and reduce your burden when you use it in manuscript and grant submission systems. +email.welcome.for_more_information=for more information on how to get the most out of your ORCID record. +email.welcome.please_visit_our=Please visit our +email.welcome.researcher_homepage=researcher homepage +email.welcome.verify.1=Verifying your email address unlocks 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.welcome.verify.2=How do I verify my email address? +email.welcome.verify.3=Simply click the button below to sign into your ORCID record and complete verification. +email.welcome.verify.4=Or, copy and paste the link below into your browser's address bar: +email.welcome.visit=Please visit our researcher homepage for more information on how to get the most out of your ORCID record. \ No newline at end of file diff --git a/orcid-core/src/main/resources/org/orcid/core/template/email_footer.ftl b/orcid-core/src/main/resources/org/orcid/core/template/email_footer.ftl index cbe1a64df0d..29894621caa 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/email_footer.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/email_footer.ftl @@ -9,4 +9,4 @@ https://support.orcid.org <@emailMacros.msg "email.common.address2" /> -${baseUri} +${baseUri} \ No newline at end of file diff --git a/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address.ftl b/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address.ftl new file mode 100644 index 00000000000..c917c34d235 --- /dev/null +++ b/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address.ftl @@ -0,0 +1,5 @@ +<@emailMacros.msg "email.welcome.verify.2" /> + +<@emailMacros.msg "email.welcome.verify.4" /> + +${verificationUrl}?lang=${locale} \ No newline at end of file diff --git a/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address_html.ftl new file mode 100644 index 00000000000..4d24229fd87 --- /dev/null +++ b/orcid-core/src/main/resources/org/orcid/core/template/how_do_i_verify_my_email_address_html.ftl @@ -0,0 +1,33 @@ +

+ <@emailMacros.msg "email.welcome.verify.2" />
+ <@emailMacros.msg "email.welcome.verify.3" /> + + + + + + +
+ <@emailMacros.msg "email.button" /> +
+

+

+ <@emailMacros.msg "email.welcome.verify.4" /> + + + + + + +
+

+ ${verificationUrl}?lang=${locale} +

+
+

\ No newline at end of file diff --git a/orcid-core/src/main/resources/org/orcid/core/template/verification_email_html_v2.ftl b/orcid-core/src/main/resources/org/orcid/core/template/verification_email_html_v2.ftl index 0bfbce81fb9..b8150dca9b6 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/verification_email_html_v2.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/verification_email_html_v2.ftl @@ -1,89 +1,32 @@ -<#-- - - ============================================================================= - - ORCID (R) Open Source - http://orcid.org - - Copyright (c) 2012-2014 ORCID, Inc. - Licensed under an MIT-Style License (MIT) - http://orcid.org/open-source-license - - This copyright and license information (including a link to the full license) - shall be included in its entirety in all copies or substantial portion of - the software. - - ============================================================================= - ---> <#import "email_macros.ftl" as emailMacros /> <#escape x as x?html> - - ${subject} - - -
- ORCID.org -
-

- <#if isPrimary?? && isPrimary> - <@emailMacros.msg "email.verify.primary_reminder_v2" /><@emailMacros.space /> - - <@emailMacros.msg "email.verify.thank_you_button" /> + + ${subject} + + +

+ ORCID.org +
+

+ <@emailMacros.msg "email.welcome.your_id.id" /><@emailMacros.space />${orcidId}
+ <@emailMacros.msg "email.welcome.your_id.link" /><@emailMacros.space />${baseUri}/${orcidId}

- - - - - - -
- <@emailMacros.msg "email.button" /> -
- - - - - - - -
-

- ${verificationUrl}?lang=${locale} -

-
- -

- <@emailMacros.msg "email.verify.1" /><@emailMacros.space />${orcid}<@emailMacros.msg "email.verify.2" /><@emailMacros.space />${baseUri}/${orcid}<@emailMacros.space /><@emailMacros.msg "email.verify.primary_email_1" /><@emailMacros.space />${primaryEmail}<@emailMacros.msg "email.verify.primary_email_2" />. -

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

+ <@emailMacros.msg "email.verify.hi" /><@emailMacros.space />${userName},
+ <#if isPrimary?? && isPrimary><@emailMacros.msg "email.verify.primary.reminder" /><#else><@emailMacros.msg "email.verify.alternate.reminder" /> +

+ <#include "how_do_i_verify_my_email_address_html.ftl"/> +
+ <#if isPrimary?? && isPrimary> +

+ <@emailMacros.msg "email.welcome.please_visit_our" /><@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/verification_email_v2.ftl b/orcid-core/src/main/resources/org/orcid/core/template/verification_email_v2.ftl index 1ef6330fd54..c578d75c1b9 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/verification_email_v2.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/verification_email_v2.ftl @@ -1,29 +1,14 @@ -<#-- - - ============================================================================= - - ORCID (R) Open Source - http://orcid.org +<#import "email_macros.ftl" as emailMacros /> +<@emailMacros.msg "email.welcome.your_id.id" /><@emailMacros.space />${orcidId} +<@emailMacros.msg "email.welcome.your_id.link" /><@emailMacros.space />${baseUri}/${orcidId} - Copyright (c) 2012-2014 ORCID, Inc. - Licensed under an MIT-Style License (MIT) - http://orcid.org/open-source-license +<@emailMacros.msg "email.verify.hi" /><@emailMacros.space />${userName}, + <#if isPrimary?? && isPrimary><@emailMacros.msg "email.verify.primary.reminder" /><#else><@emailMacros.msg "email.verify.alternate.reminder" /> - This copyright and license information (including a link to the full license) - shall be included in its entirety in all copies or substantial portion of - the software. - ============================================================================= +<#include "how_do_i_verify_my_email_address.ftl"/> ---> -<#import "email_macros.ftl" as emailMacros /> <#if isPrimary?? && isPrimary> - <@emailMacros.msg "email.verify.primary_reminder_v2" /><@emailMacros.space /> - -<@emailMacros.msg "email.verify.thank_you" /> - -${verificationUrl}?lang=${locale} - -<@emailMacros.msg "email.verify.1" /><@emailMacros.space />${orcid}<@emailMacros.msg "email.verify.2" /><@emailMacros.space />${baseUri}/${orcid}?lang=${locale}<@emailMacros.space /><@emailMacros.msg "email.verify.primary_email_1" /><@emailMacros.space />${primaryEmail}<@emailMacros.msg "email.verify.primary_email_2" />. - -<#include "email_footer.ftl"/> +<@emailMacros.msg "email.welcome.please_visit_our" /><@emailMacros.space /><@emailMacros.msg "email.welcome.researcher_homepage" /><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" /> + +<#include "email_footer.ftl"/> \ No newline at end of file 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 e7e997ee7ae..a0680244566 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 @@ -24,65 +24,25 @@ ${subject} -
+
ORCID.org
-

- <@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.your_id.id" /><@emailMacros.space />${orcidId}
+ <@emailMacros.msg "email.welcome.your_id.link" /><@emailMacros.space />${baseUri}/${orcidId}

-

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

+

+ <@emailMacros.msg "email.welcome" /><@emailMacros.space />${userName},
+ <@emailMacros.msg "email.welcome.congrats" />

- - - - - - - -
- <@emailMacros.msg "email.button" /> -
- - - - - - - -
-

- ${verificationUrl}?lang=${locale} -

-
- - -

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

+ <@emailMacros.msg "email.welcome.verify.1" /> +

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

+ <@emailMacros.msg "email.welcome.please_visit_our" /><@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 23f5ab9c28e..57deb640511 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 @@ -18,14 +18,16 @@ --> <#import "email_macros.ftl" as emailMacros /> -<@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.your_id.id" /><@emailMacros.space />${orcidId}
+<@emailMacros.msg "email.welcome.your_id.link" /><@emailMacros.space />${baseUri}/${orcidId} -<@emailMacros.msg "email.welcome.please_verify_your_email" /> +<@emailMacros.msg "email.welcome" /><@emailMacros.space />${userName} +<@emailMacros.msg "email.welcome.congrats" /> -<@emailMacros.msg "email.button" /> +<@emailMacros.msg "email.welcome.verify.1" /> -${verificationUrl}?lang=${locale} +<#include "how_do_i_verify_my_email_address.ftl"/> -<@emailMacros.msg "email.welcome.please_visit_your" /><@emailMacros.space /><@emailMacros.msg "email.welcome.researcher_homepage" /><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" /> +<@emailMacros.msg "email.welcome.please_visit_our" /><@emailMacros.space /><@emailMacros.msg "email.welcome.researcher_homepage" /><@emailMacros.space /><@emailMacros.msg "email.welcome.for_more_information" /> <#include "email_footer.ftl"/> diff --git a/orcid-core/src/test/java/org/orcid/core/manager/TemplateManagerTest.java b/orcid-core/src/test/java/org/orcid/core/manager/TemplateManagerTest.java index fbcdba1cbcc..2b21ae373b3 100644 --- a/orcid-core/src/test/java/org/orcid/core/manager/TemplateManagerTest.java +++ b/orcid-core/src/test/java/org/orcid/core/manager/TemplateManagerTest.java @@ -1,9 +1,9 @@ package org.orcid.core.manager; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.Locale; @@ -32,38 +32,83 @@ public class TemplateManagerTest { private OrcidUrlManager orcidUrlManager; @Resource(name = "messageSource") - private MessageSource messages; + private MessageSource messages; @Test - public void testProcessTemplate() { - Map params = new HashMap(); - params.put("name", "Declan"); - params.put("word", "cucumber"); - String result = templateManager.processTemplate("test.ftl", params); - assertNotNull(result); - assertEquals("Hello, Declan. Did you say cucumber?", result); - } + public void testGenerateVerifyEmailNonPrimaryPlain() throws IOException { + String expectedText = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_non_primary.txt"), StandardCharsets.UTF_8); + + Map templateParams = new HashMap(); + templateParams.put("primaryEmail", "josiah_carberry@brown.edu"); + templateParams.put("userName", "Josiah Carberry"); + templateParams.put("subject", "[ORCID] Reminder to verify your email address"); + templateParams.put("verificationUrl", "http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0"); + templateParams.put("orcidId", "4444-4444-4444-4446"); + templateParams.put("baseUri", orcidUrlManager.getBaseUrl()); + addStandardParams(templateParams); + // Generate body from template + String body = templateManager.processTemplate("verification_email_v2.ftl", templateParams); + + assertEquals(expectedText, body); + } + @Test - public void testGenerateVerifyEmailBody() throws IOException { - String expectedText = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_body.txt")); - String expectedHtml = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_body.html")); - + public void testGenerateVerifyEmailPrimaryPlain() throws IOException { + String expectedText = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_primary.txt"), StandardCharsets.UTF_8); + Map templateParams = new HashMap(); templateParams.put("primaryEmail", "josiah_carberry@brown.edu"); - templateParams.put("emailName", "Josiah Carberry"); + templateParams.put("userName", "Josiah Carberry"); templateParams.put("subject", "[ORCID] Reminder to verify your email address"); templateParams.put("verificationUrl", "http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0"); - templateParams.put("orcid", "4444-4444-4444-4446"); + templateParams.put("orcidId", "4444-4444-4444-4446"); templateParams.put("baseUri", orcidUrlManager.getBaseUrl()); - templateParams.put("baseUriHttp", orcidUrlManager.getBaseUriHttp()); + templateParams.put("isPrimary", true); addStandardParams(templateParams); // Generate body from template String body = templateManager.processTemplate("verification_email_v2.ftl", templateParams); + + assertEquals(expectedText, body); + } + + @Test + public void testGenerateVerifyEmailNonPrimaryHtml() throws IOException { + String expectedHtml = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_non_primary.html"), StandardCharsets.UTF_8); + + Map templateParams = new HashMap(); + templateParams.put("primaryEmail", "josiah_carberry@brown.edu"); + templateParams.put("userName", "Josiah Carberry"); + templateParams.put("subject", "[ORCID] Reminder to verify your email address"); + templateParams.put("verificationUrl", "http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0"); + templateParams.put("orcidId", "4444-4444-4444-4446"); + templateParams.put("baseUri", orcidUrlManager.getBaseUrl()); + addStandardParams(templateParams); + + // Generate body from template + String htmlBody = templateManager.processTemplate("verification_email_html_v2.ftl", templateParams); + + assertEquals(expectedHtml, htmlBody); + } + + @Test + public void testGenerateVerifyEmailPrimaryHtml() throws IOException { + String expectedHtml = IOUtils.toString(getClass().getResourceAsStream("example_verification_email_primary.html"), StandardCharsets.UTF_8); + + Map templateParams = new HashMap(); + templateParams.put("primaryEmail", "josiah_carberry@brown.edu"); + templateParams.put("userName", "Josiah Carberry"); + templateParams.put("subject", "[ORCID] Reminder to verify your email address"); + templateParams.put("verificationUrl", "http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0"); + templateParams.put("orcidId", "4444-4444-4444-4446"); + templateParams.put("baseUri", orcidUrlManager.getBaseUrl()); + templateParams.put("isPrimary", true); + addStandardParams(templateParams); + + // Generate body from template String htmlBody = templateManager.processTemplate("verification_email_html_v2.ftl", templateParams); - assertEquals(expectedText, body); assertEquals(expectedHtml, htmlBody); } diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html deleted file mode 100644 index c039b148b10..00000000000 --- a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - [ORCID] Reminder to verify your email address - - -
- ORCID.org -
-

-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:

- - - - - - -
- Verify your email address -
- - - - - - - -
-

- http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en -

-
- -

- Your 16-digit ORCID identifier is 4444-4444-4444-4446, and your full ORCID iD and the link to your public record is https://testserver.orcid.org/4444-4444-4444-4446 (primary email address: josiah_carberry@brown.edu). -

-

-

-Warm Regards,
-ORCID Support Team
-https://support.orcid.org
-
-

-

-You have received this email as a service announcement related to your ORCID Account.

-

- -email preferences -| privacy policy -| ORCID, Inc. | 10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA -| ORCID.org - -

-
- - diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.html b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.html new file mode 100644 index 00000000000..e183c954857 --- /dev/null +++ b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.html @@ -0,0 +1,68 @@ + + + + [ORCID] Reminder to verify your email address + + +
+ ORCID.org +
+

+ Your ORCID iD: 4444-4444-4444-4446
+ Your ORCID record is https://testserver.orcid.org/4444-4444-4444-4446 +

+
+

+ Hi Josiah Carberry,
+You need to verify your email address.

+

+ How do I verify my email address?
+Simply click the button below to sign into your ORCID record and complete verification. + + + + + +
+ Verify your email address +
+

+

+Or, copy and paste the link below into your browser's address bar: + + + + + +
+

+ http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en +

+
+

+

+

+Warm Regards,
+ORCID Support Team
+https://support.orcid.org
+
+

+

+You have received this email as a service announcement related to your ORCID Account.

+

+ +email preferences +| privacy policy +| ORCID, Inc. | 10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA +| ORCID.org + +

+
+ + diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.txt b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.txt similarity index 51% rename from orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.txt rename to orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.txt index 8b513334045..c9814c6e584 100644 --- a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_body.txt +++ b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_non_primary.txt @@ -1,8 +1,12 @@ -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: -http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en +Your ORCID iD: 4444-4444-4444-4446 +Your ORCID record is https://testserver.orcid.org/4444-4444-4444-4446 -Your 16-digit ORCID identifier is 4444-4444-4444-4446, and your full ORCID iD and the link to your public record is https://testserver.orcid.org/4444-4444-4444-4446?lang=en (primary email address: josiah_carberry@brown.edu). +Hi Josiah Carberry, +You need to verify your email address. +How do I verify my email address? +Or, copy and paste the link below into your browser's address bar: +http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en Warm Regards, ORCID Support Team https://support.orcid.org @@ -12,4 +16,4 @@ email preferences (https://testserver.orcid.org/account) privacy policy (https://testserver.orcid.org/privacy-policy) ORCID, Inc. 10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA -https://testserver.orcid.org +https://testserver.orcid.org \ No newline at end of file diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.html b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.html new file mode 100644 index 00000000000..cfa14ee28ff --- /dev/null +++ b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.html @@ -0,0 +1,71 @@ + + + + [ORCID] Reminder to verify your email address + + +
+ ORCID.org +
+

+ Your ORCID iD: 4444-4444-4444-4446
+ Your ORCID record is https://testserver.orcid.org/4444-4444-4444-4446 +

+
+

+ Hi Josiah Carberry,
+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.

+

+ How do I verify my email address?
+Simply click the button below to sign into your ORCID record and complete verification. + + + + + +
+ Verify your email address +
+

+

+Or, copy and paste the link below into your browser's address bar: + + + + + +
+

+ http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en +

+
+

+

+ Please visit our researcher homepage for more information on how to get the most out of your ORCID record. +

+

+

+Warm Regards,
+ORCID Support Team
+https://support.orcid.org
+
+

+

+You have received this email as a service announcement related to your ORCID Account.

+

+ +email preferences +| privacy policy +| ORCID, Inc. | 10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA +| ORCID.org + +

+
+ + diff --git a/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.txt b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.txt new file mode 100644 index 00000000000..b59adc89620 --- /dev/null +++ b/orcid-core/src/test/resources/org/orcid/core/manager/example_verification_email_primary.txt @@ -0,0 +1,20 @@ +Your ORCID iD: 4444-4444-4444-4446 +Your ORCID record is https://testserver.orcid.org/4444-4444-4444-4446 + +Hi Josiah Carberry, +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. + +How do I verify my email address? +Or, copy and paste the link below into your browser's address bar: +http://testserver.orcid.org/verify-email/WnhVWGhYVk9lTng4bWdqaDl0azBXY3BmN1F4dHExOW95SnNxeVJSMy9Scz0?lang=en +Please visit our researcher homepage for more information on how to get the most out of your ORCID record. +Warm Regards, +ORCID Support Team +https://support.orcid.org + +You have received this email as a service announcement related to your ORCID Account. +email preferences (https://testserver.orcid.org/account) +privacy policy (https://testserver.orcid.org/privacy-policy) +ORCID, Inc. +10411 Motor City Drive, Suite 750, Bethesda, MD 20817, USA +https://testserver.orcid.org \ No newline at end of file diff --git a/orcid-core/src/test/resources/org/orcid/core/template/test.ftl b/orcid-core/src/test/resources/org/orcid/core/template/test.ftl deleted file mode 100644 index e85c0386479..00000000000 --- a/orcid-core/src/test/resources/org/orcid/core/template/test.ftl +++ /dev/null @@ -1 +0,0 @@ -Hello, ${name}. Did you say ${word}? \ No newline at end of file diff --git a/orcid-core/src/test/resources/test-activities-2.0_rc1.xml b/orcid-core/src/test/resources/test-activities-2.0_rc1.xml deleted file mode 100644 index d45f3aaa812..00000000000 --- a/orcid-core/src/test/resources/test-activities-2.0_rc1.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - education:department-name - education:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - affiliation:department-name - affiliation:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - common:translated-title - - - - http://tempuri.org - self - grant_number - funding:external-identifier-value - - - grant - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - - - - - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - - http://orcid.org - self - agr - work:external-identifier-id - - - - 1948 - 02 - 02 - - issn:1119191 - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2005-11-12T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - - common:translated-title - - - - http://orcid.org - self - agr - work:external-identifier-id - - - artistic-performance - - 1948 - 02 - 02 - - - - - \ No newline at end of file diff --git a/orcid-core/src/test/resources/test-activities-2.0_rc2.xml b/orcid-core/src/test/resources/test-activities-2.0_rc2.xml deleted file mode 100644 index 9345b990ba3..00000000000 --- a/orcid-core/src/test/resources/test-activities-2.0_rc2.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - 2005-11-12T12:00:00 - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - education:department-name - education:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - affiliation:department-name - affiliation:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - common:translated-title - - - - grant_number - funding:external-identifier-value - http://tempuri.org - self - - - grant - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - - agr - work:external-identifier-id - http://orcid.org - self - - - - 1948 - 02 - 02 - - issn:1119191 - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - 2005-11-12T12:00:00 - - 2005-11-12T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2005-11-12T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - - common:translated-title - - - - agr - work:external-identifier-id - http://orcid.org - self - - - artistic-performance - - 1948 - 02 - 02 - - - - - \ No newline at end of file diff --git a/orcid-core/src/test/resources/test-activities-2.0_rc3.xml b/orcid-core/src/test/resources/test-activities-2.0_rc3.xml deleted file mode 100644 index fdfbcf226a5..00000000000 --- a/orcid-core/src/test/resources/test-activities-2.0_rc3.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - 2005-11-12T12:00:00 - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - education:department-name - education:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - affiliation:department-name - affiliation:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - common:translated-title - - - - grant_number - funding:external-identifier-value - http://tempuri.org - self - - - grant - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - - agr - work:external-identifier-id - http://orcid.org - self - - - - 1948 - 02 - 02 - - issn:1119191 - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - 2005-11-12T12:00:00 - - 2005-11-12T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2005-11-12T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - - common:translated-title - - - - agr - work:external-identifier-id - http://orcid.org - self - - - artistic-performance - - 1948 - 02 - 02 - - - - - \ No newline at end of file diff --git a/orcid-core/src/test/resources/test-activities-2.0_rc4.xml b/orcid-core/src/test/resources/test-activities-2.0_rc4.xml deleted file mode 100644 index 288258d26c7..00000000000 --- a/orcid-core/src/test/resources/test-activities-2.0_rc4.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - 2005-11-12T12:00:00 - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - education:department-name - education:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - affiliation:department-name - affiliation:role-title - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - common:translated-title - - - - grant_number - funding:external-identifier-value - http://tempuri.org - self - - - grant - - 2014 - 12 - 20 - - - 2014 - 12 - 20 - - - - - - 2001-12-31T12:00:00 - - 2001-12-31T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2001-12-31T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - - agr - work:external-identifier-id - http://orcid.org - self - - - - 1948 - 02 - 02 - - issn:1119191 - - common:name - - common:city - common:region - AF - - - common:disambiguated-organization-identifier - common:disambiguation-source - - - - - - - 2005-11-12T12:00:00 - - 2005-11-12T12:00:00 - - - agr - activities:external-identifier-id - - - - 2001-12-31T12:00:00 - 2005-11-12T12:00:00 - - - http://orcid.org/8888-8888-8888-8880 - 8888-8888-8888-8880 - orcid.org - - - - - common:title - - common:translated-title - - - - agr - work:external-identifier-id - http://orcid.org - self - - - artistic-performance - - 1948 - 02 - 02 - - - - - \ No newline at end of file diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/ProfileDao.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/ProfileDao.java index 4a9626f4148..1737562b61a 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/dao/ProfileDao.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/dao/ProfileDao.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.tuple.Triple; import org.orcid.persistence.jpa.entities.EmailEventType; import org.orcid.persistence.jpa.entities.IndexingStatus; import org.orcid.persistence.jpa.entities.OrcidGrantedAuthority; @@ -76,10 +76,8 @@ public interface ProfileDao extends GenericDao { void updateLastModifiedDateAndIndexingStatusWithoutResult(String orcid, Date lastModified, IndexingStatus indexingStatus); - public List> findEmailsUnverfiedDays(int daysUnverified, int maxResults); + public List> findEmailsUnverfiedDays(int daysUnverified, int maxResults); - public List> findEmailsUnverifiedDaysAndEventType(int daysUnverified, int maxResults, List eventTypes); - String retrieveOrcidType(String orcid); List findInfoForDecryptionAnalysis(); diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java index 2d97a19c212..baf0d02de86 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java @@ -5,18 +5,14 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; import javax.persistence.NoResultException; import javax.persistence.Query; import javax.persistence.TypedQuery; -import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.tuple.Triple; import org.orcid.persistence.aop.UpdateProfileLastModifiedAndIndexingStatus; import org.orcid.persistence.dao.ProfileDao; -import org.orcid.persistence.jpa.entities.EmailEventType; import org.orcid.persistence.jpa.entities.IndexingStatus; import org.orcid.persistence.jpa.entities.OrcidGrantedAuthority; import org.orcid.persistence.jpa.entities.ProfileEntity; @@ -24,7 +20,6 @@ import org.orcid.persistence.jpa.entities.ProfileEventType; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; public class ProfileDaoImpl extends GenericDaoImpl implements ProfileDao { @@ -136,8 +131,8 @@ public List findUnclaimedNotIndexedAfterWaitPeriod(int waitPeriodDays, i @SuppressWarnings("unchecked") @Override - public List> findEmailsUnverfiedDays(int daysUnverified, int maxResults) { - StringBuilder queryString = new StringBuilder("SELECT e.email, e.date_created FROM email e "); + public List> findEmailsUnverfiedDays(int daysUnverified, int maxResults) { + StringBuilder queryString = new StringBuilder("SELECT e.email, e.is_primary, e.date_created FROM email e "); queryString.append("LEFT JOIN email_event ev ON e.email = ev.email "); queryString.append("JOIN profile p on p.orcid = e.orcid and p.claimed = true "); queryString.append("AND p.deprecated_date is null AND p.profile_deactivation_date is null AND p.account_expiry is null "); @@ -149,43 +144,13 @@ public List> findEmailsUnverfiedDays(int daysUnverified, int Query query = entityManager.createNativeQuery(queryString.toString()); query.setMaxResults(maxResults); List dbInfo = query.getResultList(); - List> results = new ArrayList>(); + List> results = new ArrayList>(); dbInfo.stream().forEach(element -> { - Pair pair = Pair.of((String) element[0], (Date) element[1]); + Triple pair = Triple.of((String) element[0], (Boolean) element[1], (Date) element[2]); results.add(pair); }); return results; - } - - @SuppressWarnings("unchecked") - @Override - public List> findEmailsUnverifiedDaysAndEventType(int daysUnverified, int maxResults, List eventTypes) { - List stringList = eventTypes.stream().map(Optional::ofNullable) //Stream> - .map(opt -> opt.orElse(null)) - .map(Objects::toString) - .map(opt -> "'"+opt+"'") - .collect(Collectors.toList()); - - String eventsTypeStr = StringUtils.collectionToCommaDelimitedString(stringList); - StringBuilder queryString = new StringBuilder("SELECT e.email, e.date_created FROM email e "); - queryString.append("LEFT JOIN email_event ev ON e.email = ev.email "); - queryString.append("JOIN profile p on p.orcid = e.orcid and p.claimed = true "); - queryString.append("AND p.deprecated_date is null AND p.profile_deactivation_date is null AND p.account_expiry is null "); - queryString.append("where (ev.email IS NULL or email_event_type NOT IN ("+ eventsTypeStr+"))" + "and e.is_verified = false "); - queryString.append("and e.date_created < (now() - CAST('").append(daysUnverified).append("' AS INTERVAL DAY)) "); - queryString.append("and (e.source_id = e.orcid OR e.source_id is null)"); - queryString.append(" GROUP BY e.email, e.date_created, e.last_modified"); - queryString.append(" ORDER BY e.last_modified"); - Query query = entityManager.createNativeQuery(queryString.toString()); - query.setMaxResults(maxResults); - List dbInfo = query.getResultList(); - List> results = new ArrayList>(); - dbInfo.stream().forEach(element -> { - Pair pair = Pair.of((String) element[0], (Date) element[1]); - results.add(pair); - }); - return results; - } + } @SuppressWarnings("unchecked") @Override diff --git a/orcid-persistence/src/test/java/org/orcid/persistence/dao/ProfileDaoTest.java b/orcid-persistence/src/test/java/org/orcid/persistence/dao/ProfileDaoTest.java index 6a86cede3e0..96e6551b8e9 100644 --- a/orcid-persistence/src/test/java/org/orcid/persistence/dao/ProfileDaoTest.java +++ b/orcid-persistence/src/test/java/org/orcid/persistence/dao/ProfileDaoTest.java @@ -17,7 +17,7 @@ import javax.persistence.EntityManager; import javax.persistence.Query; -import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.tuple.Triple; import org.dbunit.dataset.DataSetException; import org.joda.time.LocalDateTime; import org.junit.AfterClass; @@ -405,13 +405,13 @@ public void findEmailsUnverfiedDaysTest() throws IllegalAccessException { // Created 15 days ago and verified assertEquals(1, insertEmailWithDateCreated("verified_2@test.orcid.org", "896dea808bbf69bde1b177f27800e84d17763860bffde1dfd8ef200e79ff9971", orcid, true, LocalDateTime.now().minusDays(15).toDate())); - List> results = profileDao.findEmailsUnverfiedDays(7, 100); + List> results = profileDao.findEmailsUnverfiedDays(7, 100); assertNotNull(results); assertEquals(2, results.size()); boolean found1 = false, found2 = false; - for(Pair element : results) { + for(Triple element : results) { assertNotNull(element.getRight()); if(element.getLeft().equals("unverified_2@test.orcid.org")) { found1 = true; diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java index 526e7812c7d..c4deda62955 100644 --- a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java +++ b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java @@ -24,7 +24,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.tuple.Triple; import org.joda.time.LocalDateTime; import org.orcid.core.constants.EmailConstants; import org.orcid.core.locale.LocaleManager; @@ -571,7 +571,7 @@ private String getHtmlBody(NotificationAdministrative notificationAdministrative @Override synchronized public void processUnverifiedEmails2Days() { LOGGER.info("About to process unverIfied emails for 2 days reminder"); - List> elements = Collections.> emptyList(); + List> elements = Collections.> emptyList(); do { elements = profileDaoReadOnly.findEmailsUnverfiedDays(verifyReminderAfterTwoDays, 100); LOGGER.info("Got batch of {} profiles with unverified emails for 2 days reminder", elements.size()); @@ -581,9 +581,9 @@ synchronized public void processUnverifiedEmails2Days() { if(Features.SEND_ALL_VERIFICATION_EMAILS.isActive()) { tooOld = now.minusDays(emailTooOld).toDate(); } - for (Pair element : elements) { + for (Triple element : elements) { if(element.getRight() == null || element.getRight().after(tooOld)) { - processUnverifiedEmails2DaysInTransaction(element.getLeft()); + processUnverifiedEmailsInTransaction(element.getLeft(), element.getMiddle(), EmailEventType.VERIFY_EMAIL_2_DAYS_SENT, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT_SKIPPED); } else { // Mark is as too old to send the verification email markUnverifiedEmailAsTooOld(element.getLeft()); @@ -596,15 +596,15 @@ synchronized public void processUnverifiedEmails2Days() { synchronized public void processUnverifiedEmails7Days() { if(Features.SEND_ALL_VERIFICATION_EMAILS.isActive()) { LOGGER.info("About to process unverIfied emails for 7 days reminder"); - List> elements = Collections.> emptyList(); + List> elements = Collections.> emptyList(); do { elements = profileDaoReadOnly.findEmailsUnverfiedDays(verifyReminderAfterSevenDays, 100); LOGGER.info("Got batch of {} profiles with unverified emails for 7 days reminder", elements.size()); LocalDateTime now = LocalDateTime.now(); Date tooOld = now.minusDays(emailTooOld).toDate(); - for (Pair element : elements) { + for (Triple element : elements) { if(element.getRight() == null || element.getRight().after(tooOld)) { - processUnverifiedEmailsInTransaction(element.getLeft(), EmailEventType.VERIFY_EMAIL_7_DAYS_SENT, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT_SKIPPED); + processUnverifiedEmailsInTransaction(element.getLeft(), element.getMiddle(), EmailEventType.VERIFY_EMAIL_7_DAYS_SENT, EmailEventType.VERIFY_EMAIL_7_DAYS_SENT_SKIPPED); } else { // Mark is as too old to send the verification email markUnverifiedEmailAsTooOld(element.getLeft()); @@ -618,15 +618,15 @@ synchronized public void processUnverifiedEmails7Days() { synchronized public void processUnverifiedEmails28Days() { if(Features.SEND_ALL_VERIFICATION_EMAILS.isActive()) { LOGGER.info("About to process unverIfied emails for 28 days reminder"); - List> elements = Collections.> emptyList(); + List> elements = Collections.> emptyList(); do { elements = profileDaoReadOnly.findEmailsUnverfiedDays(verifyReminderAfterTwentyEightDays, 100); LOGGER.info("Got batch of {} profiles with unverified emails for 28 days reminder", elements.size()); LocalDateTime now = LocalDateTime.now(); Date tooOld = now.minusDays(emailTooOld).toDate(); - for (Pair element : elements) { + for (Triple element : elements) { if(element.getRight() == null || element.getRight().after(tooOld)) { - processUnverifiedEmailsInTransaction(element.getLeft(),EmailEventType.VERIFY_EMAIL_28_DAYS_SENT, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT_SKIPPED); + processUnverifiedEmailsInTransaction(element.getLeft(), element.getMiddle(), EmailEventType.VERIFY_EMAIL_28_DAYS_SENT, EmailEventType.VERIFY_EMAIL_28_DAYS_SENT_SKIPPED); } else { // Mark is as too old to send the verification email markUnverifiedEmailAsTooOld(element.getLeft()); @@ -636,14 +636,14 @@ synchronized public void processUnverifiedEmails28Days() { } } - private void processUnverifiedEmailsInTransaction(final String email, EmailEventType eventSent, EmailEventType eventSkipped) { + private void processUnverifiedEmailsInTransaction(final String email, final Boolean isPrimaryEmail, EmailEventType eventSent, EmailEventType eventSkipped) { transactionTemplate.execute(new TransactionCallbackWithoutResult() { @Override @Transactional protected void doInTransactionWithoutResult(TransactionStatus status) { try { String userOrcid = emailManagerReadOnly.findOrcidIdByEmail(email); - sendVerificationReminderEmail(userOrcid, email); + sendVerificationReminderEmail(userOrcid, email, isPrimaryEmail); emailEventDao.persist(new EmailEventEntity(email, eventSent)); emailEventDao.flush(); } catch (Exception e) { @@ -653,26 +653,7 @@ protected void doInTransactionWithoutResult(TransactionStatus status) { } } }); - } - - private void processUnverifiedEmails2DaysInTransaction(final String email) { - transactionTemplate.execute(new TransactionCallbackWithoutResult() { - @Override - @Transactional - protected void doInTransactionWithoutResult(TransactionStatus status) { - try { - String userOrcid = emailManagerReadOnly.findOrcidIdByEmail(email); - sendVerificationReminderEmail(userOrcid, email); - emailEventDao.persist(new EmailEventEntity(email, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT)); - emailEventDao.flush(); - } catch (Exception e) { - LOGGER.error("Unable to send unverified email reminder to email: " + email, e); - emailEventDao.persist(new EmailEventEntity(email, EmailEventType.VERIFY_EMAIL_2_DAYS_SENT_SKIPPED)); - emailEventDao.flush(); - } - } - }); - } + } private void markUnverifiedEmailAsTooOld(final String email) { transactionTemplate.execute(new TransactionCallbackWithoutResult() { @@ -685,13 +666,12 @@ protected void doInTransactionWithoutResult(TransactionStatus status) { }); } - private void sendVerificationReminderEmail(String userOrcid, String email) { + private void sendVerificationReminderEmail(String userOrcid, String email, Boolean isPrimaryEmail) { ProfileEntity profile = profileEntityCacheManager.retrieve(userOrcid); Locale locale = getUserLocaleFromProfileEntity(profile); - String primaryEmail = emailManagerReadOnly.findPrimaryEmail(userOrcid).getEmail(); String emailFriendlyName = recordNameManagerV3.deriveEmailFriendlyName(userOrcid); - Map templateParams = verifyEmailUtils.createParamsForVerificationEmail(emailFriendlyName, userOrcid, email, primaryEmail, locale); + Map templateParams = verifyEmailUtils.createParamsForVerificationEmail(emailFriendlyName, userOrcid, email, isPrimaryEmail, locale); String subject = (String) templateParams.get("subject"); templateParams.put("isReminder", true); // Generate body from template diff --git a/orcid-web/src/main/java/org/orcid/frontend/email/RecordEmailSender.java b/orcid-web/src/main/java/org/orcid/frontend/email/RecordEmailSender.java index b3a4d049f1b..564c8fb71bb 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/email/RecordEmailSender.java +++ b/orcid-web/src/main/java/org/orcid/frontend/email/RecordEmailSender.java @@ -89,37 +89,16 @@ public void sendWelcomeEmail(String userOrcid, String email) { String subject = messages.getMessage("email.subject.register.welcome", null, userLocale); - String emailName = recordNameManager.deriveEmailFriendlyName(userOrcid); + String userName = recordNameManager.deriveEmailFriendlyName(userOrcid); String verificationUrl = verifyEmailUtils.createVerificationUrl(email, orcidUrlManager.getBaseUrl()); String orcidId = userOrcid; String baseUri = orcidUrlManager.getBaseUrl(); - String baseUriHttp = orcidUrlManager.getBaseUriHttp(); - + templateParams.put("subject", subject); - templateParams.put("emailName", emailName); + templateParams.put("userName", userName); templateParams.put("verificationUrl", verificationUrl); templateParams.put("orcidId", orcidId); - templateParams.put("baseUri", baseUri); - templateParams.put("baseUriHttp", baseUriHttp); - - SourceEntity source = sourceManager.retrieveActiveSourceEntity(); - if (source != null) { - String sourceId = SourceEntityUtils.getSourceId(source); - String sourceName = sourceEntityUtils.getSourceName(source); - // If the source is not the user itself - if (sourceId != null && !sourceId.equals(orcidId)) { - if (!PojoUtil.isEmpty(sourceName)) { - String paramValue = " " + messages.getMessage("common.through", null, userLocale) + " " + sourceName + "."; - templateParams.put("source_name_if_exists", paramValue); - } else { - templateParams.put("source_name_if_exists", "."); - } - } else { - templateParams.put("source_name_if_exists", "."); - } - } else { - templateParams.put("source_name_if_exists", "."); - } + templateParams.put("baseUri", baseUri); verifyEmailUtils.addMessageParams(templateParams, userLocale); @@ -127,7 +106,7 @@ public void sendWelcomeEmail(String userOrcid, String email) { String body = templateManager.processTemplate("welcome_email_v2.ftl", templateParams); // Generate html from template String html = templateManager.processTemplate("welcome_email_html_v2.ftl", templateParams); - + mailgunManager.sendEmail(EmailConstants.DO_NOT_REPLY_VERIFY_ORCID_ORG, email, subject, body, html); } @@ -400,23 +379,21 @@ public void sendForgottenIdEmailNotFoundEmail(String email, Locale locale) { public void sendVerificationEmailToNonPrimaryEmails(String userOrcid) { emailManager.getEmails(userOrcid).getEmails().stream().filter(e -> !e.isPrimary()).map(e -> e.getEmail()).forEach(e -> { - sendVerificationEmail(userOrcid, e); + sendVerificationEmail(userOrcid, e, false); }); } - public void sendVerificationEmail(String userOrcid, String email) { - processVerificationEmail(userOrcid, email, false); + public void sendVerificationEmail(String userOrcid, String email, Boolean isPrimaryEmail) { + processVerificationEmail(userOrcid, email, isPrimaryEmail); } - private void processVerificationEmail(String userOrcid, String email, boolean isVerificationReminder) { + private void processVerificationEmail(String userOrcid, String email, boolean isPrimaryEmail) { ProfileEntity profile = profileEntityCacheManager.retrieve(userOrcid); Locale locale = getUserLocaleFromProfileEntity(profile); - - String primaryEmail = emailManager.findPrimaryEmail(userOrcid).getEmail(); + String emailFriendlyName = recordNameManager.deriveEmailFriendlyName(userOrcid); - Map templateParams = verifyEmailUtils.createParamsForVerificationEmail(emailFriendlyName, userOrcid, email, primaryEmail, locale); - String subject = (String) templateParams.get("subject"); - templateParams.put("isReminder", isVerificationReminder); + Map templateParams = verifyEmailUtils.createParamsForVerificationEmail(emailFriendlyName, userOrcid, email, isPrimaryEmail, locale); + String subject = (String) templateParams.get("subject"); // Generate body from template String body = templateManager.processTemplate("verification_email_v2.ftl", templateParams); String htmlBody = templateManager.processTemplate("verification_email_html_v2.ftl", templateParams); diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/AdminController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/AdminController.java index e92a67ca7a9..2badc25731a 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/AdminController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/AdminController.java @@ -26,6 +26,8 @@ import org.orcid.core.manager.v3.read_only.RecordNameManagerReadOnly; import org.orcid.core.togglz.Features; import org.orcid.core.utils.OrcidStringUtils; +import org.orcid.frontend.email.RecordEmailSender; +import org.orcid.frontend.web.util.PasswordConstants; import org.orcid.jaxb.model.clientgroup.ClientType; import org.orcid.jaxb.model.clientgroup.MemberType; import org.orcid.jaxb.model.common.OrcidType; @@ -33,8 +35,6 @@ import org.orcid.jaxb.model.v3.release.record.Email; import org.orcid.jaxb.model.v3.release.record.Emails; import org.orcid.jaxb.model.v3.release.record.Name; -import org.orcid.frontend.email.RecordEmailSender; -import org.orcid.frontend.web.util.PasswordConstants; import org.orcid.persistence.jpa.entities.ClientDetailsEntity; import org.orcid.persistence.jpa.entities.ProfileEntity; import org.orcid.pojo.AdminChangePassword; @@ -332,7 +332,8 @@ else if (PojoUtil.isEmpty(email) || !validateEmailAddress(email)) // Notify any new email address if (!emailsToNotify.isEmpty()) { for (String emailToNotify : emailsToNotify) { - recordEmailSender.sendVerificationEmail(orcid, emailToNotify); + boolean isPrimaryEmail = emailManager.isPrimaryEmail(orcid, emailToNotify); + recordEmailSender.sendVerificationEmail(orcid, emailToNotify, isPrimaryEmail); } } profileDetails.setStatus(getMessage("admin.success")); diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java index 4fa8de4c1f6..1579ef03bb1 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java @@ -62,7 +62,6 @@ import org.orcid.pojo.ajaxForm.Email; import org.orcid.pojo.ajaxForm.Errors; import org.orcid.pojo.ajaxForm.NamesForm; -import org.orcid.pojo.ajaxForm.OtherNamesForm; import org.orcid.pojo.ajaxForm.PojoUtil; import org.orcid.pojo.ajaxForm.Text; import org.orcid.pojo.ajaxForm.Visibility; @@ -79,8 +78,6 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.fasterxml.jackson.databind.JsonNode; - /** * @author Declan Newman (declan) Date: 22/02/2012 */ @@ -500,16 +497,18 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht @RequestMapping(value = "/verifyEmail.json", method = RequestMethod.GET) public @ResponseBody Errors verifyEmail(HttpServletRequest request, @RequestParam("email") String email) { String currentUserOrcid = getCurrentUserOrcid(); - String primaryEmail = emailManager.findPrimaryEmail(currentUserOrcid).getEmail(); - if (primaryEmail.equals(email)) - request.getSession().setAttribute(EmailConstants.CHECK_EMAIL_VALIDATED, false); - - String emailOwner = emailManagerReadOnly.findOrcidIdByEmail(email); + + String emailOwner = emailManagerReadOnly.findOrcidIdByEmail(email); if(!currentUserOrcid.equals(emailOwner)) { - throw new IllegalArgumentException("Invalid email address provided"); + throw new IllegalArgumentException("Invalid email address provided"); + } + + boolean isPrimaryEmail = emailManagerReadOnly.isPrimaryEmail(currentUserOrcid, email); + if (isPrimaryEmail) { + request.getSession().setAttribute(EmailConstants.CHECK_EMAIL_VALIDATED, false); } - recordEmailSender.sendVerificationEmail(currentUserOrcid, email); + recordEmailSender.sendVerificationEmail(currentUserOrcid, email, isPrimaryEmail); return new Errors(); } @@ -649,7 +648,7 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht request.getSession().setAttribute(EmailConstants.CHECK_EMAIL_VALIDATED, false); recordEmailSender.sendEmailAddressChangedNotification(currentUserOrcid, keys.get("new"), keys.get("old")); } - recordEmailSender.sendVerificationEmail(currentUserOrcid, OrcidStringUtils.filterEmailAddress(email.getValue())); + recordEmailSender.sendVerificationEmail(currentUserOrcid, OrcidStringUtils.filterEmailAddress(email.getValue()), email.isPrimary()); } else { email.setErrors(errors); } @@ -745,7 +744,7 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht String oldPrimary = keys.get("old"); recordEmailSender.sendEmailAddressChangedNotification(orcid, newPrimary, oldPrimary); if(keys.containsKey("sendVerification")) { - recordEmailSender.sendVerificationEmail(orcid, newPrimary); + recordEmailSender.sendVerificationEmail(orcid, newPrimary, true); request.getSession().setAttribute(EmailConstants.CHECK_EMAIL_VALIDATED, false); } } @@ -795,7 +794,8 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht recordEmailSender.sendEmailAddressChangedNotification(orcid, newPrimary, oldPrimary); } String verifyAddress = keys.get("verifyAddress"); - recordEmailSender.sendVerificationEmail(orcid, verifyAddress); + boolean isPrimaryEmail = keys.containsKey("new") ? true : false; + recordEmailSender.sendVerificationEmail(orcid, verifyAddress, isPrimaryEmail); } else { editEmail.setErrors(errors); } diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java index 2ebc5e67a8f..58dd41d5e43 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PasswordResetController.java @@ -535,7 +535,8 @@ private void reactivateAndLogUserIn(HttpServletRequest request, HttpServletRespo // Notify any new email address if (!emailsToNotify.isEmpty()) { for (String emailToNotify : emailsToNotify) { - recordEmailSender.sendVerificationEmail(orcid, emailToNotify); + boolean isPrimaryEmail = emailManager.isPrimaryEmail(orcid, emailToNotify); + recordEmailSender.sendVerificationEmail(orcid, emailToNotify, isPrimaryEmail); } } diff --git a/orcid-web/src/test/java/org/orcid/frontend/email/RecordEmailSenderTest.java b/orcid-web/src/test/java/org/orcid/frontend/email/RecordEmailSenderTest.java index 2aace4025a2..a8fccba27aa 100644 --- a/orcid-web/src/test/java/org/orcid/frontend/email/RecordEmailSenderTest.java +++ b/orcid-web/src/test/java/org/orcid/frontend/email/RecordEmailSenderTest.java @@ -4,6 +4,8 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.io.IOException; @@ -22,6 +24,7 @@ import org.mockito.MockitoAnnotations; import org.orcid.core.adapter.v3.JpaJaxbNotificationAdapter; import org.orcid.core.common.manager.EmailFrequencyManager; +import org.orcid.core.constants.EmailConstants; import org.orcid.core.manager.EncryptionManager; import org.orcid.core.manager.ProfileEntityCacheManager; import org.orcid.core.manager.v3.EmailManager; @@ -106,6 +109,7 @@ public void before() { ReflectionTestUtils.setField(recordEmailSender, "emailManager", mockEmailManager); ReflectionTestUtils.setField(recordEmailSender, "recordNameManager", mockRecordNameManager); ReflectionTestUtils.setField(recordEmailSender, "profileEventDao", mockProfileEventDao); + ReflectionTestUtils.setField(recordEmailSender, "mailgunManager", mockMailGunManager); } @@ -114,8 +118,10 @@ public void testSendWelcomeEmail() throws JAXBException, IOException, URISyntaxE Email email = new Email(); email.setEmail("josiah_carberry@brown.edu"); when(mockEmailManager.findPrimaryEmail(anyString())).thenReturn(email); - + recordEmailSender.sendWelcomeEmail("4444-4444-4444-4446", "josiah_carberry@brown.edu"); + + verify(mockMailGunManager, times(1)).sendEmail(eq(EmailConstants.DO_NOT_REPLY_VERIFY_ORCID_ORG), eq("josiah_carberry@brown.edu"), eq("[ORCID] Welcome to ORCID"), anyString(), anyString()); } @Test @@ -128,7 +134,7 @@ public void testSendVerificationEmail() throws JAXBException, IOException, URISy email.setEmail("josiah_carberry@brown.edu"); when(mockEmailManager.findPrimaryEmail(anyString())).thenReturn(email); - recordEmailSender.sendVerificationEmail("4444-4444-4444-4446", "josiah_carberry@brown.edu"); + recordEmailSender.sendVerificationEmail("4444-4444-4444-4446", "josiah_carberry@brown.edu", true); } @Test diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageProfileControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageProfileControllerTest.java index b6e3b48be85..3323573e4bf 100644 --- a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageProfileControllerTest.java +++ b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageProfileControllerTest.java @@ -964,7 +964,7 @@ public void testVerifyEmail() { mockRequest.setSession(mockSession); controller.verifyEmail(mockRequest, "email@email.com"); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@email.com")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@email.com"), eq(false)); } @Test @@ -987,7 +987,7 @@ public void testAddEmail_noPrimaryEmailChange() { controller.addEmails(mockRequest, newEmail); verify(mockRecordEmailSender, Mockito.never()).sendEmailAddressChangedNotification(any(), any(), any()); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("new@email.com")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("new@email.com"), eq(false)); } @Test @@ -1010,7 +1010,7 @@ public void testAddEmail_primaryEmailChange() { controller.addEmails(mockRequest, newEmail); verify(mockRecordEmailSender, Mockito.times(1)).sendEmailAddressChangedNotification(eq(USER_ORCID), eq("new@email.com"), eq("old@email.com")); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("new@email.com")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("new@email.com"), eq(false)); } @Test @@ -1031,7 +1031,7 @@ public void testSetPrimary_nothingChange() { controller.setPrimary(mockRequest, email); verify(mockRecordEmailSender, Mockito.never()).sendEmailAddressChangedNotification(any(), any(), any()); - verify(mockRecordEmailSender, Mockito.never()).sendVerificationEmail(any(), any()); + verify(mockRecordEmailSender, Mockito.never()).sendVerificationEmail(any(), any(), any()); } @Test @@ -1052,7 +1052,7 @@ public void testSetPrimary_primaryEmailChange() { controller.setPrimary(mockRequest, email); verify(mockRecordEmailSender, Mockito.times(1)).sendEmailAddressChangedNotification(eq(USER_ORCID), eq("email@orcid.org"), eq("old@orcid.org")); - verify(mockRecordEmailSender, Mockito.never()).sendVerificationEmail(any(), any()); + verify(mockRecordEmailSender, Mockito.never()).sendVerificationEmail(any(), any(), any()); } @Test @@ -1076,7 +1076,7 @@ public void testSetPrimary_primaryEmailChangeAndPrimaryIsNotVerified() { controller.setPrimary(mockRequest, email); verify(mockRecordEmailSender, Mockito.times(1)).sendEmailAddressChangedNotification(eq(USER_ORCID), eq("email@orcid.org"), eq("old@orcid.org")); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org"), eq(true)); } @Test @@ -1100,7 +1100,7 @@ public void testEditEmail_noPrimaryChange() { controller.editEmail(mockRequest, email); verify(mockRecordEmailSender, Mockito.never()).sendEmailAddressChangedNotification(any(), any(), any()); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org"), eq(false)); } @Test @@ -1121,7 +1121,7 @@ public void testEditEmail_primaryEmailChange() { controller.editEmail(mockRequest, email); verify(mockRecordEmailSender, Mockito.times(1)).sendEmailAddressChangedNotification(eq(USER_ORCID), eq("email@orcid.org"), eq("old@orcid.org")); - verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org")); + verify(mockRecordEmailSender, Mockito.times(1)).sendVerificationEmail(eq(USER_ORCID), eq("email@orcid.org"), eq(true)); } protected Authentication getAuthentication(String orcid) {