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

Merge branch '4.7' into 4

This commit is contained in:
Maxime Rainville 2021-04-14 11:35:58 +12:00
parent 6fc25e4e96 0e4527824c
commit fdd23a3675
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en.yml
View File

@ -269,6 +269,8 @@ en:
FIRSTNAME: 'First Name'
INTERFACELANG: 'Interface Language'
KEEPMESIGNEDIN: 'Keep me signed in'
REMEMBER_ME: 'Remember me for {count} days'
KEEP_ME_SIGNED_IN_TOOLTIP: 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.'
LOGGEDINAS: 'You''re logged in as {name}.'
NEWPASSWORD: 'New Password'
PASSWORD: Password

15
src/Security/MemberAuthenticator/CMSMemberLoginForm.php
View File

@ -58,15 +58,20 @@ class CMSMemberLoginForm extends MemberLoginForm
'Password',
CheckboxField::create(
"Remember",
_t('SilverStripe\\Security\\Member.KEEPMESIGNEDIN', "Keep me signed in")
)->setAttribute(
'title',
_t(
'SilverStripe\\Security\\Member.REMEMBERME',
"Remember me next time? (for {count} days on this device)",
'SilverStripe\\Security\\Member.REMEMBER_ME',
"Remember me for {count} days",
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
)
)
->setAttribute(
'title',
_t(
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP',
'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.',
['count' => RememberLoginHash::config()->uninherited('token_expiry_days')]
)
)
);
}

15
src/Security/MemberAuthenticator/MemberLoginForm.php
View File

@ -153,15 +153,20 @@ class MemberLoginForm extends BaseLoginForm
$fields->push(
CheckboxField::create(
"Remember",
_t('SilverStripe\\Security\\Member.KEEPMESIGNEDIN', "Keep me signed in")
)->setAttribute(
'title',
_t(
'SilverStripe\\Security\\Member.REMEMBERME',
"Remember me next time? (for {count} days on this device)",
'SilverStripe\\Security\\Member.REMEMBER_ME',
"Remember me for {count} days",
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
)
)
->setAttribute(
'title',
_t(
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP',
'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using. Authenticated devices can be managed in your profile.',
['count' => RememberLoginHash::config()->uninherited('token_expiry_days')]
)
)
);
}