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

Merge pull request #9983 from creative-commoners/pulls/4.7/cannot-manager-authenticated 

ENH Remove wording for authenticated devices being manageable
This commit is contained in:
Andre Kiste 2021-06-18 16:46:13 +12:00 committed by GitHub
parent 06dbd5237b b625ba99b3
commit 6046fda7da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/en.yml
View File

@ -7,7 +7,7 @@ en:
EDITINFO: 'Edit this file'
REMOVE: Remove
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDFOREMAIL: "The password for account with email address {email} has been changed. If you didn't change your password please change your password using the link below"
CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn\''t change your password please change your password using the link below'
CHANGEPASSWORDTEXT1: 'You changed your password for'
CHANGEPASSWORDTEXT3: 'Change password'
HELLO: Hi
@ -266,8 +266,7 @@ en:
ERRORWRONGCRED: 'The provided details don''t seem to be correct. Please try again.'
FIRSTNAME: 'First Name'
INTERFACELANG: 'Interface Language'
KEEPMESIGNEDIN: 'Keep me signed in'
REMEMBER_ME: 'Keep me signed in for {count} days'
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}.'
NEWPASSWORD: 'New Password'
@ -277,7 +276,6 @@ en:
PLURALS:
one: 'A Member'
other: '{count} Members'
REMEMBERME: 'Remember me next time? (for {count} days on this device)'
SINGULARNAME: Member
SUBJECTPASSWORDCHANGED: 'Your password has been changed'
SUBJECTPASSWORDRESET: 'Your password reset link'

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

@ -59,8 +59,8 @@ class CMSMemberLoginForm extends MemberLoginForm
CheckboxField::create(
"Remember",
_t(
'SilverStripe\\Security\\Member.REMEMBER_ME',
"Remember me for {count} days",
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN',
'Keep me signed in for {count} days',
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
)
)
@ -68,7 +68,7 @@ class CMSMemberLoginForm extends MemberLoginForm
'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.',
'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')]
)
)

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

@ -154,8 +154,8 @@ class MemberLoginForm extends BaseLoginForm
CheckboxField::create(
"Remember",
_t(
'SilverStripe\\Security\\Member.REMEMBER_ME',
"Remember me for {count} days",
'SilverStripe\\Security\\Member.KEEP_ME_SIGNED_IN',
'Keep me signed in for {count} days',
[ 'count' => RememberLoginHash::config()->uninherited('token_expiry_days') ]
)
)
@ -163,7 +163,7 @@ class MemberLoginForm extends BaseLoginForm
'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.',
'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')]
)
)