litvinovg/vivo
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:34 -04:00
parent a8908964f2
commit fe60f7315c
3 changed files with 0 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
languages/example/themes/wilma/i18n/all_es.properties
View file

@ -194,14 +194,7 @@ hyperlink = Hiperenlace
#
# accounts templates ( /templates/freemarker/body/accounts )
#
congratulations = ¡Enhorabuena!
we_have_created_your_account = Hemos creado el nuevo {0} cuenta asociada a {1}.
did_not_request_text = Si no has solicitado esta nueva cuenta puede ignorar este mensaje. Esta solicitud caducará si no se hubiere pronunciado sobre durante 30 días.
click_to_create_password = Haga clic en el enlace de abajo para crear la contraseña de su cuenta usando nuestro servidor seguro.
password = contraseña
if_link_failed = Si el enlace no funciona, puedes copiar y pegar el enlace directamente en la barra de direcciones de su navegador.
thanks = ¡Gracias!
paste_the_link = Pega el siguiente enlace en la barra de direcciones de su navegador para crear la contraseña de su cuenta usando nuestro servidor seguro.
#
# harvester templates ( /templates/freemarker/body/harvester )

64
productMods/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
View file

@ -1,64 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Confirmation that an account has been created. -->
<#assign subject = "${i18n().account_created_subject(siteName)}" />
<#assign html>
<html>
<head>
<title>${subject}</title>
</head>
<body>
<p>
${userAccount.firstName} ${userAccount.lastName}
</p>
<p>
<strong>${i18n().congratulations}</strong>
</p>
<p>
${i18n().we_have_created_your_account(siteName,userAccount.emailAddress)}
</p>
<p>
${i18n().did_not_request_text}
</p>
<p>
${i18n().click_to_create_password}
</p>
<p>
<a href="${passwordLink}" title="${i18n().password}">${passwordLink}</a>
</p>
<p>
${i18n().if_link_failed}
</p>
<p>
${i18n().thanks}
</p>
</body>
</html>
</#assign>
<#assign text>
${userAccount.firstName} ${userAccount.lastName}
${i18n().congratulations}
${i18n().we_have_created_your_account(siteName,userAccount.emailAddress)}
${i18n().did_not_request_text}
${i18n().paste_the_link}
${passwordLink}
${i18n().thanks}
</#assign>
<@email subject=subject html=html text=text />

8
themes/wilma/i18n/all.properties
View file

@ -194,15 +194,7 @@ hyperlink = Hyperlink
#
# accounts templates ( /templates/freemarker/body/accounts )
#
congratulations = Congratulations!
we_have_created_your_account = We have created your new {0} account associated with {1}.
did_not_request_text = 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_to_create_password = Click the link below to create your password for your new account using our secure server.
password = password
if_link_failed = If the link above doesn't work, you can copy and paste the link directly into your browser's address bar.
thanks = Thanks!
paste_the_link = Paste the link below into your browser's address bar to create your password for your new account using our secure server.
#
# harvester templates ( /templates/freemarker/body/harvester )