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.8

This commit is contained in:
Steve Boyd 2021-06-21 14:58:40 +12:00
parent 852268990c 6046fda7da
commit e812999632
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/en.yml
View File

@ -267,6 +267,8 @@ en:
FIRSTNAME: 'First Name' FIRSTNAME: 'First Name'
INTERFACELANG: 'Interface Language' INTERFACELANG: 'Interface Language'
KEEPMESIGNEDIN: 'Keep me signed in' KEEPMESIGNEDIN: 'Keep me signed in'
KEEP_ME_SIGNED_IN: 'Keep me signed in 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.'
LOGGEDINAS: 'You''re logged in as {name}.' LOGGEDINAS: 'You''re logged in as {name}.'
NEWPASSWORD: 'New Password' NEWPASSWORD: 'New Password'
PASSWORD: Password PASSWORD: Password
@ -275,7 +277,6 @@ en:
PLURALS: PLURALS:
one: 'A Member' one: 'A Member'
other: '{count} Members' other: '{count} Members'
REMEMBERME: 'Remember me next time? (for {count} days on this device)'
SINGULARNAME: Member SINGULARNAME: Member
SUBJECTPASSWORDCHANGED: 'Your password has been changed' SUBJECTPASSWORDCHANGED: 'Your password has been changed'
SUBJECTPASSWORDRESET: 'Your password reset link' SUBJECTPASSWORDRESET: 'Your password reset link'

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

@ -59,8 +59,8 @@ class CMSMemberLoginForm extends MemberLoginForm
CheckboxField::create( CheckboxField::create(
"Remember", "Remember",
_t( _t(
'SilverStripe\\Security\\Member.REMEMBER_ME', 'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN',
"Remember me for {count} days", 'Keep me signed in for {count} days',
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
) )
) )
@ -68,7 +68,7 @@ class CMSMemberLoginForm extends MemberLoginForm
'title', 'title',
_t( _t(
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP', '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.', 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using.',
['count' => RememberLoginHash::config()->uninherited('token_expiry_days')] ['count' => RememberLoginHash::config()->uninherited('token_expiry_days')]
) )
) )

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

@ -154,8 +154,8 @@ class MemberLoginForm extends BaseLoginForm
CheckboxField::create( CheckboxField::create(
"Remember", "Remember",
_t( _t(
'SilverStripe\\Security\\Member.REMEMBER_ME', 'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN',
"Remember me for {count} days", 'Keep me signed in for {count} days',
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ] [ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
) )
) )
@ -163,7 +163,7 @@ class MemberLoginForm extends BaseLoginForm
'title', 'title',
_t( _t(
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN_TOOLTIP', '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.', 'You will remain authenticated on this device for {count} days. Only use this feature if you trust the device you are using.',
['count' => RememberLoginHash::config()->uninherited('token_expiry_days')] ['count' => RememberLoginHash::config()->uninherited('token_expiry_days')]
) )
) )