+ ${userAccount.firstName} ${userAccount.lastName} +
+ ++ Enhorabuena! +
+ ++ Hemos creado la nueva cuenta en ${siteName}, asociada con ${userAccount.emailAddress}. +
+ ++ Si no has solicitado esta nueva cuenta puede ignorar este mensaje. + Esta solicitud caducará si no se hubiere pronunciado sobre durante 30 días. +
+ ++ Haga clic en el enlace de abajo para crear la contraseña de su cuenta usando nuestro servidor seguro. +
+ ++ ${passwordLink} +
+ ++ Si el enlace no funciona, puedes copiar y pegar el enlace directamente en la barra de direcciones de su navegador. +
+ ++ ¡Gracias! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Enhorabuena! + +Hemos creado la nueva cuenta en ${siteName}, +asociada con ${userAccount.emailAddress}. + +Si no has solicitado esta nueva cuenta puede ignorar este mensaje. +Esta solicitud caducará si no se hubiere pronunciado sobre durante 30 días. + +Pega el siguiente enlace en la barra de direcciones de su navegador para +crear su contraseña para su nueva cuenta usando nuestro servidor seguro. + +${passwordLink} + +¡Gracias! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl new file mode 100644 index 000000000..0b91545fe --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl @@ -0,0 +1,43 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation that an account has been created. --> + +<#assign subject = "Su cuenta ${siteName} ha sido creada." /> + +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
+ ++ ¡Enhorabuena! +
+ ++ Hemos creado la nueva cuenta VIVO asociado con ${userAccount.emailAddress}. +
+ ++ ¡Gracias! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +¡Enhorabuena! + +Hemos creado la nueva cuenta VIVO asociado con +${userAccount.emailAddress}. + +¡Gracias! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl new file mode 100644 index 000000000..a3674c8cf --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl @@ -0,0 +1,38 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation that the user has changed his email account. --> + +<#assign subject = "Su cuenta de correo electrónico ${siteName} ha cambiado." /> + +<#assign html> + + ++ Hola, ${userAccount.firstName} ${userAccount.lastName} +
+ ++ Ha cambiado recientemente la dirección de correo electrónico asociada a + ${userAccount.firstName} ${userAccount.lastName} +
+ ++ Gracias. +
+ + + + +<#assign text> +Hola, ${userAccount.firstName} ${userAccount.lastName} + +Ha cambiado recientemente la dirección de correo electrónico asociada a +${userAccount.firstName} ${userAccount.lastName} + +Gracias. + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl new file mode 100644 index 000000000..5c6558a52 --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl @@ -0,0 +1,43 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation that an account has been created for an externally-authenticated user. --> + +<#assign subject = "Su cuenta ${siteName} ha sido creada." /> + +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
+ ++ ¡Enhorabuena! +
+ ++ Hemos creado la nueva cuenta VIVO asociado con ${userAccount.emailAddress}. +
+ ++ ¡Gracias! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +¡Enhorabuena! + +Hemos creado la nueva cuenta VIVO asociado con +${userAccount.emailAddress}. + +¡Gracias! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl new file mode 100644 index 000000000..f3e272055 --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl @@ -0,0 +1,43 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation that an password has been created. --> + +<#assign subject = "El ${siteName} contraseña ha sido creado con éxito." /> + +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
+ ++ Contraseña creado con éxito. +
+ ++ Su nueva contraseña asociada con ${userAccount.emailAddress} se ha creado. +
+ ++ Gracias. +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Contraseña creado con éxito. + +Su nueva contraseña asociada con ${userAccount.emailAddress} +se ha creado. + +Gracias. + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl new file mode 100644 index 000000000..64ca61dae --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl @@ -0,0 +1,44 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation that a password has been reset. --> + +<#assign subject = "El ${siteName} contraseña cambiada." /> + +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
+ ++ Contraseña cambiada con éxito. +
+ ++ Su nueva contraseña asociada con ${userAccount.emailAddress} ha sido cambiado. +
+ ++ Gracias. +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Contraseña cambiada con éxito. + +Su nueva contraseña asociada con ${userAccount.emailAddress} +ha sido cambiado. + +Gracias. + + +<@email subject=subject html=html text=text /> diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl b/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl new file mode 100644 index 000000000..2f0bccc98 --- /dev/null +++ b/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl @@ -0,0 +1,62 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Confirmation email for user account password reset --> + +<#assign subject = "${siteName} restablecer solicitud de contraseña" /> + +<#assign html> + + ++ Estimado ${userAccount.firstName} ${userAccount.lastName}: +
+ ++ Hemos recibido una solicitud para restablecer la contraseña de su cuenta ${siteName} + (${userAccount.emailAddress}). +
+ ++ Por favor, siga las siguientes instrucciones para proceder con su restablecimiento de contraseña. +
+ ++ Si no has solicitado esta nueva cuenta puede ignorar este mensaje. + Esta solicitud caducará si no se hubiere pronunciado en un plazo de 30 días. +
+ ++ Haga clic en el enlace de abajo o pegarlo en la barra de direcciones de su navegador para + restablecer su contraseña usando nuestro servidor seguro. +
+ +${passwordLink}
+ +¡Gracias!
+ + + + +<#assign text> +Estimado ${userAccount.firstName} ${userAccount.lastName}: + +Hemos recibido una solicitud para restablecer la contraseña de su cuenta ${siteName} +(${userAccount.emailAddress}). + +Por favor, siga las siguientes instrucciones para proceder con su restablecimiento de contraseña. + +Si no has solicitado esta nueva cuenta puede ignorar este mensaje. +Esta solicitud caducará si no se hubiere pronunciado en un plazo de 30 días. + +Pega el siguiente enlace en la barra de direcciones de su navegador para +restablecer su contraseña usando nuestro servidor seguro. + +${passwordLink} + +¡Gracias! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties index 193c8a2e7..38912ca5f 100644 --- a/webapp/web/i18n/all.properties +++ b/webapp/web/i18n/all.properties @@ -134,10 +134,6 @@ submit_add_new_account = Add new account account_created = Your {0} account has been created. account_created_subject = Your {0} account has been created. -account_created_email_html = @@file files/accountCreatedEmail.html -account_created_email_text = @@file files/accountCreatedEmail.txt -account_created_external_email_html = @@file files/accountCreatedExternalOnlyEmail.html -account_created_external_email_text = @@file files/accountCreatedExternalOnlyEmail.txt confirm_delete_account_singular = Are you sure you want to delete this account? confirm_delete_account_plural = Are you sure you want to delete these accounts? @@ -156,21 +152,11 @@ select_associated_profile = Select the associated profile create_associated_profile = Create the associated profile email_changed_subject = Your {0} email account has been changed. -email_changed_html = @@file files/accountEmailChanged.html -email_changed_text = @@file files/accountEmailChanged.txt create_your_password = Create your Password password_created_subject = Your {0} password has successfully been created. -password_created_email_html = @@file files/passwordCreatedEmail.html -password_created_email_text = @@file files/passwordCreatedEmail.txt - password_reset_pending_subject = {0} reset password request -password_reset_pending_email_html = @@file files/passwordResetPending.html -password_reset_pending_email_text = @@file files/passwordResetPending.txt - password_reset_complete_subject = Your {0} password changed. -password_reset_complete_email_html = @@file files/passwordResetComplete.html -password_reset_complete_email_text = @@file files/passwordResetComplete.txt reset_your_password = Reset your Password first_time_login = First time log in @@ -193,8 +179,6 @@ password_saved_please_login = Your password has been saved. Please log in. please_provide_contact_information = Please provide your contact information to finish creating your account. first_time_login_note = Note: An email will be sent to the address entered above notifying \ that an account has been created. -first_time_external_email_html = @@file files/accountFirstTimeExternal.html -first_time_external_email_text = @@file files/accountFirstTimeExternal.txt myAccount_heading = My account myAccount_confirm_changes = Your changes have been saved. diff --git a/webapp/web/i18n/files/accountCreatedEmail.html b/webapp/web/i18n/files/accountCreatedEmail.html deleted file mode 100644 index 96b84d727..000000000 --- a/webapp/web/i18n/files/accountCreatedEmail.html +++ /dev/null @@ -1,39 +0,0 @@ - - -- {2} {3} -
- -- Congratulations! -
- -- We have created your new account on {0}, associated with {4}. -
- -- If you did not request this new account you can safely ignore this email. - This request will expire if not acted upon for 30 days. -
- -- Click the link below to create your password for your new account using our secure server. -
- -- {5} -
- -- If the link above doesn't work, you can copy and paste the link directly into your browser's address bar. -
- -- Thanks! -
- - diff --git a/webapp/web/i18n/files/accountCreatedEmail.txt b/webapp/web/i18n/files/accountCreatedEmail.txt deleted file mode 100644 index 4dcd900c8..000000000 --- a/webapp/web/i18n/files/accountCreatedEmail.txt +++ /dev/null @@ -1,17 +0,0 @@ -{2} {3} - -Congratulations! - -We have created your new account on {0}, -associated with {4}. - -If you did not request this new account you can safely ignore this email. -This request will expire if not acted upon for 30 days. - -Paste the link below into your browser's address bar to create your password -for your new account using our secure server. - -{5} - -Thanks! - diff --git a/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.html b/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.html deleted file mode 100644 index 164bf87ae..000000000 --- a/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.html +++ /dev/null @@ -1,22 +0,0 @@ - - -- ${2} ${3} -
- -- Congratulations! -
- -- We have created your new VIVO account associated with ${4}. -
- -- Thanks! -
- - diff --git a/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.txt b/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.txt deleted file mode 100644 index c55cb3f9a..000000000 --- a/webapp/web/i18n/files/accountCreatedExternalOnlyEmail.txt +++ /dev/null @@ -1,9 +0,0 @@ -${2} ${3} - -Congratulations! - -We have created your new VIVO account associated with -${4}. - -Thanks! - diff --git a/webapp/web/i18n/files/accountEmailChanged.html b/webapp/web/i18n/files/accountEmailChanged.html deleted file mode 100644 index 5a2e51e50..000000000 --- a/webapp/web/i18n/files/accountEmailChanged.html +++ /dev/null @@ -1,19 +0,0 @@ - - -- Hi, {2} ${3} -
- -- You recently changed the email address associated with - ${2} ${3} -
- -- Thank you. -
- - diff --git a/webapp/web/i18n/files/accountEmailChanged.txt b/webapp/web/i18n/files/accountEmailChanged.txt deleted file mode 100644 index 5f560dca1..000000000 --- a/webapp/web/i18n/files/accountEmailChanged.txt +++ /dev/null @@ -1,6 +0,0 @@ -Hi, {2} {3} - -You recently changed the email address associated with -{2} {3} - -Thank you. diff --git a/webapp/web/i18n/files/accountFirstTimeExternal.html b/webapp/web/i18n/files/accountFirstTimeExternal.html deleted file mode 100644 index 61dca7f3c..000000000 --- a/webapp/web/i18n/files/accountFirstTimeExternal.html +++ /dev/null @@ -1,22 +0,0 @@ - - -- {2} {3} -
- -- Congratulations! -
- -- We have created your new {0} account associated with {4}. -
- -- Thanks! -
- - diff --git a/webapp/web/i18n/files/accountFirstTimeExternal.txt b/webapp/web/i18n/files/accountFirstTimeExternal.txt deleted file mode 100644 index 1cb60552b..000000000 --- a/webapp/web/i18n/files/accountFirstTimeExternal.txt +++ /dev/null @@ -1,8 +0,0 @@ -{2} {3} - -Congratulations! - -We have created your new {0} account associated with -{4} - -Thanks! diff --git a/webapp/web/i18n/files/passwordCreatedEmail.html b/webapp/web/i18n/files/passwordCreatedEmail.html deleted file mode 100644 index 15cf8bb0d..000000000 --- a/webapp/web/i18n/files/passwordCreatedEmail.html +++ /dev/null @@ -1,22 +0,0 @@ - - -- {2} {3} -
- -- Password successfully created. -
- -- Your new password associated with {4} has been created. -
- -- Thank you. -
- - diff --git a/webapp/web/i18n/files/passwordCreatedEmail.txt b/webapp/web/i18n/files/passwordCreatedEmail.txt deleted file mode 100644 index dbd9e9da0..000000000 --- a/webapp/web/i18n/files/passwordCreatedEmail.txt +++ /dev/null @@ -1,8 +0,0 @@ -{2} {3} - -Password successfully created. - -Your new password associated with {4} -has been created. - -Thank you. diff --git a/webapp/web/i18n/files/passwordRequestPending.html b/webapp/web/i18n/files/passwordRequestPending.html deleted file mode 100644 index bd20cb392..000000000 --- a/webapp/web/i18n/files/passwordRequestPending.html +++ /dev/null @@ -1,34 +0,0 @@ - - -- Dear {2} {3}: -
- -- We have received a request to reset the password for your {0} account ({4}). -
- -- Please follow the instructions below to proceed with your password reset. -
- -- If you did not request this new account you can safely ignore this email. - This request will expire if not acted upon within 30 days. -
- -- Click on the link below or paste it into your browser's address bar to reset your password - using our secure server. -
- -- {5} -
- -Thank you!
- - diff --git a/webapp/web/i18n/files/passwordRequestPending.txt b/webapp/web/i18n/files/passwordRequestPending.txt deleted file mode 100644 index e8c92b5f2..000000000 --- a/webapp/web/i18n/files/passwordRequestPending.txt +++ /dev/null @@ -1,16 +0,0 @@ -Dear {2} {3}: - -We have received a request to reset the password for your {0} account -({4}). - -Please follow the instructions below to proceed with your password reset. - -If you did not request this new account you can safely ignore this email. -This request will expire if not acted upon within 30 days. - -Paste the link below into your browser's address bar to reset your password -using our secure server. - -{5} - -Thank you! diff --git a/webapp/web/i18n/files/passwordResetComplete.html b/webapp/web/i18n/files/passwordResetComplete.html deleted file mode 100644 index bfa756f15..000000000 --- a/webapp/web/i18n/files/passwordResetComplete.html +++ /dev/null @@ -1,22 +0,0 @@ - - -- {2} {3} -
- -- Password successfully changed. -
- -- Your new password associated with {4} has been changed. -
- -- Thank you. -
- - diff --git a/webapp/web/i18n/files/passwordResetComplete.txt b/webapp/web/i18n/files/passwordResetComplete.txt deleted file mode 100644 index 99503085c..000000000 --- a/webapp/web/i18n/files/passwordResetComplete.txt +++ /dev/null @@ -1,8 +0,0 @@ -{2} {3} - -Password successfully changed. - -Your new password associated with {4} -has been changed. - -Thank you. diff --git a/webapp/web/i18n/files/passwordResetPending.html b/webapp/web/i18n/files/passwordResetPending.html deleted file mode 100644 index bd20cb392..000000000 --- a/webapp/web/i18n/files/passwordResetPending.html +++ /dev/null @@ -1,34 +0,0 @@ - - -- Dear {2} {3}: -
- -- We have received a request to reset the password for your {0} account ({4}). -
- -- Please follow the instructions below to proceed with your password reset. -
- -- If you did not request this new account you can safely ignore this email. - This request will expire if not acted upon within 30 days. -
- -- Click on the link below or paste it into your browser's address bar to reset your password - using our secure server. -
- -- {5} -
- -Thank you!
- - diff --git a/webapp/web/i18n/files/passwordResetPending.txt b/webapp/web/i18n/files/passwordResetPending.txt deleted file mode 100644 index 5d34952f3..000000000 --- a/webapp/web/i18n/files/passwordResetPending.txt +++ /dev/null @@ -1,16 +0,0 @@ -Dear {2} {3}: - -We have received a request to reset the password for your {0} account -({4}). - -Please follow the instructions below to proceed with your password reset. - -If you did not request this new account you can safely ignore this email. -This request will expire if not acted upon within 30 days. - -Paste the link below into your browser's address bar to reset your password -using our secure server. - -{5} - -Thank you! \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl index b02c2e415..ce80a5481 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl @@ -2,22 +2,67 @@ <#-- Confirmation that an account has been created. --> -<#assign strings = i18n() /> +<#assign subject = "Your ${siteName} account has been created." /> -<#assign subject = strings.account_created(siteName) /> +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
-<#assign html = strings.account_created_email_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress, - passwordLink) /> ++ Congratulations! +
-<#assign text = strings.account_created_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress, - passwordLink) /> ++ We have created your new account on ${siteName}, associated with ${userAccount.emailAddress}. +
-<@email subject=subject html=html text=text /> \ No newline at end of file ++ If you did not request this new account you can safely ignore this email. + This request will expire if not acted upon for 30 days. +
+ ++ Click the link below to create your password for your new account using our secure server. +
+ ++ ${passwordLink} +
+ ++ If the link above doesn't work, you can copy and paste the link directly into your browser's address bar. +
+ ++ Thanks! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Congratulations! + +We have created your new account on ${siteName}, +associated with ${userAccount.emailAddress}. + +If you did not request this new account you can safely ignore this email. +This request will expire if not acted upon for 30 days. + +Paste the link below into your browser's address bar to create your password +for your new account using our secure server. + +${passwordLink} + +Thanks! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl index 9b787983c..844df023c 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl @@ -2,18 +2,42 @@ <#-- Confirmation that an account has been created. --> -<#assign subject = strings.account_created(siteName) /> +<#assign subject = "Your ${siteName} account has been created." /> -<#assign html = strings.account_created_external_email_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
-<#assign text = string.account_created_external_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Congratulations! +
-<@email subject=subject html=html text=text /> \ No newline at end of file ++ We have created your new VIVO account associated with ${userAccount.emailAddress}. +
+ ++ Thanks! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Congratulations! + +We have created your new VIVO account associated with +${userAccount.emailAddress}. + +Thanks! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl index d091af468..2f55508f7 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl @@ -2,20 +2,37 @@ <#-- Confirmation that the user has changed his email account. --> -<#assign strings = i18n() /> +<#assign subject = "Your ${siteName} email account has been changed." /> -<#assign subject = strings.email_changed_subject(siteName) /> +<#assign html> + + ++ Hi, ${userAccount.firstName} ${userAccount.lastName} +
-<#assign html = strings.email_changed_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ You recently changed the email address associated with + ${userAccount.firstName} ${userAccount.lastName} +
-<#assign text = strings.email_changed_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Thank you. +
+ + + + +<#assign text> +Hi, ${userAccount.firstName} ${userAccount.lastName} + +You recently changed the email address associated with +${userAccount.firstName} ${userAccount.lastName} + +Thank you. + <@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl index 27cb200d7..04a8e6e2b 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl @@ -2,20 +2,42 @@ <#-- Confirmation that an account has been created for an externally-authenticated user. --> -<#assign strings = i18n() /> +<#assign subject = "Your ${siteName} account has been created." /> -<#assign subject = strings.account_created(siteName) /> +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
-<#assign html = strings.first_time_external_email_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Congratulations! +
-<#assign text = strings.first_time_external_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ We have created your new VIVO account associated with ${userAccount.emailAddress}. +
-<@email subject=subject html=html text=text /> \ No newline at end of file ++ Thanks! +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Congratulations! + +We have created your new VIVO account associated with +${userAccount.emailAddress}. + +Thanks! + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl index 60cc436d7..2f80d500d 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl @@ -2,20 +2,42 @@ <#-- Confirmation that an password has been created. --> -<#assign strings = i18n() /> +<#assign subject = "Your ${siteName} password has successfully been created." /> -<#assign subject = strings.password_created_subject(siteName) /> +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
-<#assign html = strings.password_created_email_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Password successfully created. +
-<#assign text = strings.password_created_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Your new password associated with ${userAccount.emailAddress} has been created. +
-<@email subject=subject html=html text=text /> \ No newline at end of file ++ Thank you. +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Password successfully created. + +Your new password associated with ${userAccount.emailAddress} +has been created. + +Thank you. + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl index 55af25bfa..c4e64c1cc 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl @@ -2,20 +2,43 @@ <#-- Confirmation that a password has been reset. --> -<#assign strings = i18n() /> +<#assign subject = "Your ${siteName} password changed." /> -<#assign subject = strings.password_reset_complete_subject(siteName) /> +<#assign html> + + ++ ${userAccount.firstName} ${userAccount.lastName} +
-<#assign text = strings.password_reset_complete_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress) /> ++ Password successfully changed. +
-<@email subject=subject html=html text=text /> \ No newline at end of file ++ Your new password associated with ${userAccount.emailAddress} has been changed. +
+ ++ Thank you. +
+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Password successfully changed. + +Your new password associated with ${userAccount.emailAddress} +has been changed. + +Thank you. + + +<@email subject=subject html=html text=text /> diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl index e02bdfd9a..9ac0438ee 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl @@ -2,22 +2,60 @@ <#-- Confirmation email for user account password reset --> -<#assign strings = i18n() /> +<#assign subject = "${siteName} reset password request" /> -<#assign subject = strings.password_reset_pending_subject(siteName) /> +<#assign html> + + ++ Dear ${userAccount.firstName} ${userAccount.lastName}: +
+ ++ We have received a request to reset the password for your ${siteName} account (${userAccount.emailAddress}). +
+ ++ Please follow the instructions below to proceed with your password reset. +
+ ++ If you did not request this new account you can safely ignore this email. + This request will expire if not acted upon within 30 days. +
+ ++ Click on the link below or paste it into your browser's address bar to reset your password + using our secure server. +
+ +${passwordLink}
+ +Thank you!
+ + + -<#assign html = strings.password_reset_pending_email_html(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress, - passwordLink) /> +<#assign text> +Dear ${userAccount.firstName} ${userAccount.lastName}: + +We have received a request to reset the password for your ${siteName} account +(${userAccount.emailAddress}). -<#assign text = strings.password_reset_pending_email_text(siteName, - subject, - userAccount.firstName, - userAccount.lastName, - userAccount.emailAddress, - passwordLink) /> +Please follow the instructions below to proceed with your password reset. -<@email subject=subject html=html text=text /> \ No newline at end of file +If you did not request this new account you can safely ignore this email. +This request will expire if not acted upon within 30 days. + +Paste the link below into your browser's address bar to reset your password +using our secure server. + +${passwordLink} + +Thank you! + + +<@email subject=subject html=html text=text />