From b3eafc24a2dbc19450c8d2bacf1aee935f482e35 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 25 Jun 2008 04:01:17 +0000 Subject: [PATCH] Merged revisions 56164 via svnmerge from svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2 ........ r56164 | sharvey | 2008-06-13 10:19:41 +1200 (Fri, 13 Jun 2008) | 1 line BUGFIX ChangePasswordEmail.ss variable spacing, and missing labels for i18n _t() calls. See tickets #2571 and #2480 ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56911 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- templates/email/ChangePasswordEmail.ss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/email/ChangePasswordEmail.ss b/templates/email/ChangePasswordEmail.ss index 26b1ea26b..098bc929b 100644 --- a/templates/email/ChangePasswordEmail.ss +++ b/templates/email/ChangePasswordEmail.ss @@ -1,11 +1,11 @@

<% _t('HELLO', 'Hi') %> $FirstName,

- <% _t('CHANGEPASSWORDTEXT1', 'You changed your password for', PR_MEDIUM, 'for a url') %>$BaseHref.
+ <% _t('CHANGEPASSWORDTEXT1', 'You changed your password for', PR_MEDIUM, 'for a url') %> $BaseHref.
<% _t('CHANGEPASSWORDTEXT2', 'You can now use the following credentials to log in:') %>

- <% _t('EMAIL') %>: $Email
- <% _t('PASSWORD') %>: $CleartextPassword + <% _t('EMAIL', 'Email') %>: $Email
+ <% _t('PASSWORD', 'Password') %>: $CleartextPassword

\ No newline at end of file