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

Revert entity name change 

Partially reverts b0f38f4990
which broke unit tests relying on the old entity name
in 3.1, where translations and the en.yml master file have been backported to.
This commit is contained in:
Ingo Schommer 2013-12-19 23:13:13 +01:00
parent d1fe294d61
commit 627e3cdf11
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en.yml
View File

@ -346,7 +346,7 @@ en:
ERRORLOCKEDOUT2: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in {count} minutes.'
ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
ERRORWRONGCREDS: 'The provided details don''t seem to be correct. Please try again.'
ERRORWRONGCRED: 'The provided details don''t seem to be correct. Please try again.'
FIRSTNAME: 'First Name'
INTERFACELANG: 'Interface Language'
INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'

2
security/Member.php
View File

@ -231,7 +231,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
if(!$e->check($this->Password, $password, $this->Salt, $this)) {
$iidentifierField =
$result->error(_t (
'Member.ERRORWRONGCREDS',
'Member.ERRORWRONGCRED',
'The provided details don\'t seem to be correct. Please try again.'
));
}