litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-443 Use language-specific templates to create email

Browse source 
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 2013-10-29 17:19:51 -04:00
parent 02525c7d6b
commit 5a8f09352d
32 changed files with 625 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

48
webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
View file

@ -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 />