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

Fix unnamespaced i18n keys 

Fixes https://github.com/silverstripe/silverstripe-framework/issues/6862
This commit is contained in:
Damian Mooyman 2017-07-04 14:18:47 +12:00
parent 14db11b1cd
commit 4b23205838
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/en.yml
View File

@ -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>'

7
src/Security/Security.php
View File

@ -12,7 +12,6 @@ use SilverStripe\Control\HTTPRequest;
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 @@ class Security extends Controller implements TemplateGlobalProvider
* @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 @@ class Security extends Controller implements TemplateGlobalProvider
return $this->delegateToMultipleHandlers(
$handlers,
_t('Security.LOGIN', 'Log in'),
_t(__CLASS__.'.LOGIN', 'Log in'),
$this->getTemplatesFor('login'),
[$this, 'aggregateTabbedForms']
);
@ -721,7 +721,7 @@ class Security extends Controller implements TemplateGlobalProvider
return $this->delegateToMultipleHandlers(
$handlers,
_t('Security.LOGOUT', 'Log out'),
_t(__CLASS__.'.LOGOUT', 'Log out'),
$this->getTemplatesFor('logout'),
[$this, 'aggregateTabbedForms']
);
@ -733,6 +733,7 @@ class Security extends Controller implements TemplateGlobalProvider
*
* @param int $service
* @param HTTPRequest $request
* @return Authenticator[]
* @throws HTTPResponse_Exception
*/
protected function getServiceAuthenticatorsFromRequest($service, HTTPRequest $request)