Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2013-12-19 23:33:58 +01:00
commit 7591e43ab9
3 changed files with 7 additions and 3 deletions

View File

@ -174,7 +174,9 @@ keys is a list of reference paths to other value sections. A basic example:
:::yml :::yml
--- ---
Name: adminroutes Name: adminroutes
After: 'framework/routes#rootroutes', 'framework/routes#coreroutes' After:
- '#rootroutes'
- '#coreroutes'
--- ---
Director: Director:
rules: rules:
@ -198,6 +200,8 @@ A more complex example, taken from framework/_config/routes.yml:
Before: '*' Before: '*'
After: After:
- '#rootroutes' - '#rootroutes'
- '#coreroutes'
- '#modelascontrollerroutes'
--- ---
Director: Director:
rules: rules:

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.' 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' ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
ERRORPASSWORDNOTMATCH: 'Your current password does not match, please 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' FIRSTNAME: 'First Name'
INTERFACELANG: 'Interface Language' INTERFACELANG: 'Interface Language'
INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}' INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'

View File

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