diff --git a/public/language/en-GB/admin/settings/user.json b/public/language/en-GB/admin/settings/user.json index a6a6f26af4..0268336e5a 100644 --- a/public/language/en-GB/admin/settings/user.json +++ b/public/language/en-GB/admin/settings/user.json @@ -27,6 +27,10 @@ "lockout-duration": "Account Lockout Duration (minutes)", "login-days": "Days to remember user login sessions", "password-expiry-days": "Force password reset after a set number of days", + "session-time": "Session Time", + "session-time-days": "Days", + "session-time-seconds": "Seconds", + "session-time-help": "These values are used to govern how long a user stays logged in when they check "Remember Me" on login. Note that only one of these values will be used. If there is no seconds value we fall back to days. If there is no days value we default to 14 days.", "online-cutoff": "Minutes after user is considered inactive", "online-cutoff-help": "If user performs no actions for this duration, they are considered inactive and they do not receive realtime updates.", "registration": "User Registration", diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index 2617b26a36..5094b297e0 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -133,27 +133,26 @@
- Session time + [[admin/settings/user:session-time]]
- - + +
- - + +

- Note that only one of these values will be used. If there is no seconds value we fall back to days. If - there is no days value we default to 14 days. + [[admin/settings/user:session-time-help]]