Welcome email ready to go

orcid-core/src/main/java/org/orcid/core/utils/VerifyEmailUtils.java

@@ -29,21 +29,14 @@ public class VerifyEmailUtils {
     @Resource
     private EncryptionManager encryptionManager;
 
-    public Map<String, Object> createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, String primaryEmail, Locale locale) {
+    public Map<String, Object> createParamsForVerificationEmail(String emailFriendlyName, String orcid, String email, boolean isPrimary, Locale locale) {
         Map<String, Object> templateParams = new HashMap<String, Object>();
-
-        String subject = getSubject(primaryEmail.equalsIgnoreCase(email) ? "email.subject.verify_reminder_primary" : "email.subject.verify_reminder", locale);
-
-        templateParams.put("primaryEmail", primaryEmail);
-        templateParams.put("isPrimary", primaryEmail.equalsIgnoreCase(email));
-        templateParams.put("emailName", emailFriendlyName);
-        String verificationUrl = createVerificationUrl(email, orcidUrlManager.getBaseUrl());
-        templateParams.put("verificationUrl", verificationUrl);
-        templateParams.put("orcid", orcid);
-        templateParams.put("email", email);
-        templateParams.put("subject", subject);
-        templateParams.put("baseUri", orcidUrlManager.getBaseUrl());
-        templateParams.put("baseUriHttp", orcidUrlManager.getBaseUriHttp());
+        templateParams.put("isPrimary", isPrimary);
+        templateParams.put("userName", emailFriendlyName);
+        templateParams.put("verificationUrl", createVerificationUrl(email, orcidUrlManager.getBaseUrl()));
+        templateParams.put("orcidId", orcid);
+        templateParams.put("subject", getSubject((isPrimary ? "email.subject.verify_reminder_primary" : "email.subject.verify_reminder"), locale));
+        templateParams.put("baseUri", orcidUrlManager.getBaseUrl());        
         addMessageParams(templateParams, locale);
         return templateParams;
     }

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

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=[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!

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.

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.

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.

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.

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.

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.

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.

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.