diff --git a/lang/en.yml b/lang/en.yml index 78f000c37..9a5253bbd 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -348,7 +348,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' - ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. 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}' diff --git a/security/Member.php b/security/Member.php index 6022b0ab2..a4f212a9f 100644 --- a/security/Member.php +++ b/security/Member.php @@ -229,9 +229,10 @@ class Member extends DataObject implements TemplateGlobalProvider { $e = PasswordEncryptor::create_for_algorithm($this->PasswordEncryption); if(!$e->check($this->Password, $password, $this->Salt, $this)) { + $iidentifierField = $result->error(_t ( - 'Member.ERRORWRONGCRED', - 'That doesn\'t seem to be the right e-mail address or password. Please try again.' + 'Member.ERRORWRONGCREDS', + 'The provided details don\'t seem to be correct. Please try again.' )); }