Merge branch '4.7' into 4

lang/en.yml

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

src/Security/MemberAuthenticator/CMSMemberLoginForm.php

@@ -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',
+                        'SilverStripe\\Security\\Member.REMEMBER_ME',
-                        "Remember me next time? (for {count} days on this device)",
+                        "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')]
+                        )
+                    )
             );
         }
 

src/Security/MemberAuthenticator/MemberLoginForm.php

@@ -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',
+                        'SilverStripe\\Security\\Member.REMEMBER_ME',
-                        "Remember me next time? (for {count} days on this device)",
+                        "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')]
+                        )
+                    )
             );
         }