diff --git a/docs/en/topics/configuration.md b/docs/en/topics/configuration.md index 655128a17..7df5ba6e8 100644 --- a/docs/en/topics/configuration.md +++ b/docs/en/topics/configuration.md @@ -174,7 +174,9 @@ keys is a list of reference paths to other value sections. A basic example: :::yml --- Name: adminroutes - After: 'framework/routes#rootroutes', 'framework/routes#coreroutes' + After: + - '#rootroutes' + - '#coreroutes' --- Director: rules: @@ -198,6 +200,8 @@ A more complex example, taken from framework/_config/routes.yml: Before: '*' After: - '#rootroutes' + - '#coreroutes' + - '#modelascontrollerroutes' --- Director: rules: diff --git a/lang/en.yml b/lang/en.yml index 7921ee63d..1e00d095d 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -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}' diff --git a/security/Member.php b/security/Member.php index 89a612bd5..5305d273d 100644 --- a/security/Member.php +++ b/security/Member.php @@ -228,7 +228,7 @@ class Member extends DataObject implements TemplateGlobalProvider { $e = PasswordEncryptor::create_for_algorithm($this->PasswordEncryption); if(!$e->check($this->Password, $password, $this->Salt, $this)) { $result->error(_t ( - 'Member.ERRORWRONGCREDS', + 'Member.ERRORWRONGCRED', 'The provided details don\'t seem to be correct. Please try again.' )); }