VIVO-443 Use language-specific templates to create email
For some reason, the password-reset template was too long to do proper substitution on the last line. Removing some of the intermediate content fixed the problem, but without appropriate content. I had been unhappy with the @@file approach anyway, so I went back to language-specific templates for each type of message.
This commit is contained in:
j2blake
parent
02525c7d6b
commit
5a8f09352d
32 changed files with 625 additions and 427 deletions
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign html = strings.account_created_email_html(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress,
|
||||
passwordLink) />
|
||||
<p>
|
||||
<strong>Congratulations!</strong>
|
||||
</p>
|
||||
|
||||
<#assign text = strings.account_created_email_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress,
|
||||
passwordLink) />
|
||||
<p>
|
||||
We have created your new account on ${siteName}, associated with ${userAccount.emailAddress}.
|
||||
</p>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Click the link below to create your password for your new account using our secure server.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<a href="${passwordLink}" title="password">${passwordLink}</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If the link above doesn't work, you can copy and paste the link directly into your browser's address bar.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Thanks!
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#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!
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign text = string.account_created_external_email_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
<strong>Congratulations!</strong>
|
||||
</p>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
<p>
|
||||
We have created your new VIVO account associated with ${userAccount.emailAddress}.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Thanks!
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
Congratulations!
|
||||
|
||||
We have created your new VIVO account associated with
|
||||
${userAccount.emailAddress}.
|
||||
|
||||
Thanks!
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
Hi, ${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign html = strings.email_changed_html(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
You recently changed the email address associated with
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign text = strings.email_changed_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
Thank you.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
Hi, ${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
You recently changed the email address associated with
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
Thank you.
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign html = strings.first_time_external_email_html(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
<strong>Congratulations!</strong>
|
||||
</p>
|
||||
|
||||
<#assign text = strings.first_time_external_email_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
We have created your new VIVO account associated with ${userAccount.emailAddress}.
|
||||
</p>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
<p>
|
||||
Thanks!
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
Congratulations!
|
||||
|
||||
We have created your new VIVO account associated with
|
||||
${userAccount.emailAddress}.
|
||||
|
||||
Thanks!
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign html = strings.password_created_email_html(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
<strong>Password successfully created.</strong>
|
||||
</p>
|
||||
|
||||
<#assign text = strings.password_created_email_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
Your new password associated with ${userAccount.emailAddress} has been created.
|
||||
</p>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
<p>
|
||||
Thank you.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
Password successfully created.
|
||||
|
||||
Your new password associated with ${userAccount.emailAddress}
|
||||
has been created.
|
||||
|
||||
Thank you.
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
|
||||
<#assign html = strings.password_reset_complete_email_html(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<body>
|
||||
<p>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
</p>
|
||||
|
||||
<#assign text = strings.password_reset_complete_email_text(siteName,
|
||||
subject,
|
||||
userAccount.firstName,
|
||||
userAccount.lastName,
|
||||
userAccount.emailAddress) />
|
||||
<p>
|
||||
<strong>Password successfully changed.</strong>
|
||||
</p>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
<p>
|
||||
Your new password associated with ${userAccount.emailAddress} has been changed.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Thank you.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
${userAccount.firstName} ${userAccount.lastName}
|
||||
|
||||
Password successfully changed.
|
||||
|
||||
Your new password associated with ${userAccount.emailAddress}
|
||||
has been changed.
|
||||
|
||||
Thank you.
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<html>
|
||||
<head>
|
||||
<title>${subject}</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
Dear ${userAccount.firstName} ${userAccount.lastName}:
|
||||
</p>
|
||||
|
||||
<p>
|
||||
We have received a request to reset the password for your ${siteName} account (${userAccount.emailAddress}).
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Please follow the instructions below to proceed with your password reset.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Click on the link below or paste it into your browser's address bar to reset your password
|
||||
using our secure server.
|
||||
</p>
|
||||
|
||||
<p>${passwordLink}</p>
|
||||
|
||||
<p>Thank you!</p>
|
||||
</body>
|
||||
</html>
|
||||
</#assign>
|
||||
|
||||
<#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 />
|
||||
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!
|
||||
</#assign>
|
||||
|
||||
<@email subject=subject html=html text=text />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue