From b625ba99b3a5877e847004c41ae3e774b795f5be Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Fri, 18 Jun 2021 09:50:13 +1200
Subject: [PATCH] ENH Remove wording for authenticated devices being manageable

---
 lang/en.yml                                             | 6 ++----
 src/Security/MemberAuthenticator/CMSMemberLoginForm.php | 6 +++---
 src/Security/MemberAuthenticator/MemberLoginForm.php    | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index b5c617fdb..0d6d2e403 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -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'
diff --git a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php
index 24bdda81c..43da03d53 100644
--- a/src/Security/MemberAuthenticator/CMSMemberLoginForm.php
+++ b/src/Security/MemberAuthenticator/CMSMemberLoginForm.php
@@ -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')]
                         )
                     )
diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php
index 3b299dc64..027d62995 100644
--- a/src/Security/MemberAuthenticator/MemberLoginForm.php
+++ b/src/Security/MemberAuthenticator/MemberLoginForm.php
@@ -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')]
                         )
                     )