From 5ccdc1c01758e353f703de31ec0470032d6d1677 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 29 Oct 2018 12:29:41 -0400
Subject: [PATCH] internationalising english labels in session time ACP block,
 #6883

---
 public/language/en-GB/admin/settings/user.json |  4 ++++
 src/views/admin/settings/user.tpl              | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

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 &quot;Remember Me&quot; on login. Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If there is no <i>days</i> value we default to <i>14 days</i>.",
 	"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 @@
 
 <div class="row">
 	<div class="col-sm-2 col-xs-12 settings-header">
-		Session time
+		[[admin/settings/user:session-time]]
 	</div>
 	<div class="col-sm-10 col-xs-12">
 		<form>
 			<div class="row">
 				<div class="col-sm-6">
 					<div class="form-group">
-						<label>Days</label>
-						<input type="text" class="form-control" data-field="loginDays" placeholder="Days" />
+						<label>[[admin/settings/user:session-time-days]]</label>
+						<input type="text" class="form-control" data-field="loginDays" placeholder="[[admin/settings/user:session-time-days]]" />
 					</div>
 				</div>
 				<div class="col-sm-6">
 					<div class="form-group">
-						<label>Seconds</label>
-						<input type="text" class="form-control" data-field="loginSeconds" placeholder="Seconds" />
+						<label>[[admin/settings/user:session-time-seconds]]</label>
+						<input type="text" class="form-control" data-field="loginSeconds" placeholder="[[admin/settings/user:session-time-seconds]]" />
 					</div>
 				</div>
 				<div class="col-xs-12">
 					<p class="help-block">
-						Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If
-						there is no <i>days</i> value we default to <i>14 days</i>.
+						[[admin/settings/user:session-time-help]]
 					</p>
 				</div>
 			</div>