Skip to content
Permalink
Browse files

Fix unnamespaced i18n keys

Fixes #6862
  • Loading branch information
Damian Mooyman
Damian Mooyman committed Jul 4, 2017
1 parent 14db11b commit 4b23205838a8bb16d64a3e44a069731b235ca6ca
Showing with 6 additions and 6 deletions.
  1. +2 −3 lang/en.yml
  2. +4 −3 src/Security/Security.php
@@ -1,7 +1,4 @@
en:
Security:
LOGIN: 'Log in'
LOGOUT: 'Log out'
SilverStripe\AssetAdmin\Forms\UploadField:
Dimensions: Dimensions
EDIT: Edit
@@ -315,6 +312,8 @@ en:
CONFIRMLOGOUT: 'Please click the button below to confirm that you wish to log out.'
ENTERNEWPASSWORD: 'Please enter a new password.'
ERRORPASSWORDPERMISSION: 'You must be logged in in order to change your password!'
LOGIN: 'Log in'
LOGOUT: 'Log out'
LOSTPASSWORDHEADER: 'Lost Password'
NOTEPAGESECURED: 'That page is secured. Enter your credentials below and we will send you right along.'
NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
@@ -12,7 +12,6 @@
use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Control\RequestHandler;
use SilverStripe\Control\Session;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Convert;
use SilverStripe\Core\Injector\Injector;
@@ -655,6 +654,7 @@ public static function clearSessionMessage()
* @param null|HTTPRequest $request
* @param int $service
* @return HTTPResponse|string Returns the "login" page as HTML code.
* @throws HTTPResponse_Exception
*/
public function login($request = null, $service = Authenticator::LOGIN)
{
@@ -684,7 +684,7 @@ function (Authenticator &$auth, $name) use ($link) {
return $this->delegateToMultipleHandlers(
$handlers,
_t('Security.LOGIN', 'Log in'),
_t(__CLASS__.'.LOGIN', 'Log in'),
$this->getTemplatesFor('login'),
[$this, 'aggregateTabbedForms']
);
@@ -721,7 +721,7 @@ function (Authenticator &$auth, $name) use ($link) {
return $this->delegateToMultipleHandlers(
$handlers,
_t('Security.LOGOUT', 'Log out'),
_t(__CLASS__.'.LOGOUT', 'Log out'),
$this->getTemplatesFor('logout'),
[$this, 'aggregateTabbedForms']
);
@@ -733,6 +733,7 @@ function (Authenticator &$auth, $name) use ($link) {
*
* @param int $service
* @param HTTPRequest $request
* @return Authenticator[]
* @throws HTTPResponse_Exception
*/
protected function getServiceAuthenticatorsFromRequest($service, HTTPRequest $request)

0 comments on commit 4b23205

Please sign in to comment.
You can’t perform that action at this time.