summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/session_settings.jsx
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2016-07-05 07:26:22 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-05 07:26:22 -0400
commitd2e93e1bee8bbf18c88bbabd7bf43239c4d23199 (patch)
tree6e12d8e99ba6f70f4031bf786fc8fbca8cac07b6 /webapp/components/admin_console/session_settings.jsx
parent0557c03d11f3620b03db809dbe34f184341fea0d (diff)
downloadchat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.tar.gz
chat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.tar.bz2
chat-d2e93e1bee8bbf18c88bbabd7bf43239c4d23199.zip
Major update to System Console labelling (#3398)
Diffstat (limited to 'webapp/components/admin_console/session_settings.jsx')
-rw-r--r--webapp/components/admin_console/session_settings.jsx16
1 files changed, 8 insertions, 8 deletions
diff --git a/webapp/components/admin_console/session_settings.jsx b/webapp/components/admin_console/session_settings.jsx
index c19d4850b..2463b2dea 100644
--- a/webapp/components/admin_console/session_settings.jsx
+++ b/webapp/components/admin_console/session_settings.jsx
@@ -54,14 +54,14 @@ export default class SessionSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.service.webSessionDays'
- defaultMessage='Session Length for Web in Days:'
+ defaultMessage='Session length for email and LDAP authentication (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
helpText={
<FormattedMessage
id='admin.service.webSessionDaysDesc'
- defaultMessage='The web session will expire after the number of days specified and will require a user to login again.'
+ defaultMessage='Email or LDAP sessions will expire after the number of days specified and will require users to sign in again.'
/>
}
value={this.state.sessionLengthWebInDays}
@@ -72,14 +72,14 @@ export default class SessionSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.service.mobileSessionDays'
- defaultMessage='Session Length for Mobile Device in Days:'
+ defaultMessage='Session length for mobile apps (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
helpText={
<FormattedMessage
id='admin.service.mobileSessionDaysDesc'
- defaultMessage='The native mobile session will expire after the number of days specified and will require a user to login again.'
+ defaultMessage='Mobile sessions will expire after the number of days specified and will require users to sign in again.'
/>
}
value={this.state.sessionLengthMobileInDays}
@@ -90,14 +90,14 @@ export default class SessionSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.service.ssoSessionDays'
- defaultMessage='Session Length for SSO in Days:'
+ defaultMessage='Session length for GitLab SSO authentication (days):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
helpText={
<FormattedMessage
id='admin.service.ssoSessionDaysDesc'
- defaultMessage='The SSO session will expire after the number of days specified and will require a user to login again.'
+ defaultMessage='GitLab single-sign-on sessions will expire after the number of days specified and will require users to sign in again.'
/>
}
value={this.state.sessionLengthSSOInDays}
@@ -108,7 +108,7 @@ export default class SessionSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.service.sessionCache'
- defaultMessage='Session Cache in Minutes:'
+ defaultMessage='Session Cache (minutes):'
/>
}
placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
@@ -124,4 +124,4 @@ export default class SessionSettings extends AdminSettings {
</SettingsGroup>
);
}
-} \ No newline at end of file
+}