tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ingo Schommer 2010-05-11 10:10:23 +00:00 committed by Sam Minnee
parent bfee88a323
commit 17c67c7869
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/en_US.php
View File

@ -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';

5
security/ChangePasswordForm.php
View File

@ -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();
}