From 17c67c7869b18d32eccc64243e75c40352732734 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 11 May 2010 10:10:23 +0000 Subject: [PATCH] MINOR Fixed wrong _t() notation in ChangePasswordForm (broken in r103226 and r104596) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104598 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- lang/en_US.php | 5 +---- security/ChangePasswordForm.php | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lang/en_US.php b/lang/en_US.php index 9c1deed42..e9178d2c5 100644 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -414,10 +414,7 @@ $lang['en_US']['Member']['INTERFACELANG'] = array( PR_MEDIUM, 'Language of the CMS' ); -$lang['en_US']['Member']['INVALIDNEWPASSWORD'] = array( - 'We couldn\'t accept that password: %s', - nl2br("\n".$isValid->starredList( -); +$lang['en_US']['Member']['INVALIDNEWPASSWORD'] = 'We couldn\'t accept that password: %s'; $lang['en_US']['Member']['LOGGEDINAS'] = 'You\'re logged in as %s.'; $lang['en_US']['Member']['MOBILE'] = 'Mobile'; $lang['en_US']['Member']['NAME'] = 'Name'; diff --git a/security/ChangePasswordForm.php b/security/ChangePasswordForm.php index f15e74425..7853b6cfb 100755 --- a/security/ChangePasswordForm.php +++ b/security/ChangePasswordForm.php @@ -114,8 +114,9 @@ class ChangePasswordForm extends Form { } else { $this->clearMessage(); $this->sessionMessage( - _t('Member.INVALIDNEWPASSWORD', "We couldn't accept that password: %s", nl2br("\n".$isValid->starredList())), - "bad"); + sprintf(_t('Member.INVALIDNEWPASSWORD', "We couldn't accept that password: %s"), nl2br("\n".$isValid->starredList())), + "bad" + ); Director::redirectBack(); }