summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/connection_security_dropdown_setting.jsx15
-rw-r--r--webapp/i18n/en.json2
2 files changed, 17 insertions, 0 deletions
diff --git a/webapp/components/admin_console/connection_security_dropdown_setting.jsx b/webapp/components/admin_console/connection_security_dropdown_setting.jsx
index 09768049e..06be7f78e 100644
--- a/webapp/components/admin_console/connection_security_dropdown_setting.jsx
+++ b/webapp/components/admin_console/connection_security_dropdown_setting.jsx
@@ -30,6 +30,20 @@ const CONNECTION_SECURITY_HELP_TEXT = (
<tr>
<td>
<FormattedMessage
+ id='admin.connectionSecurityPlain'
+ defaultMessage='PLAIN'
+ />
+ </td>
+ <td>
+ <FormattedMessage
+ id='admin.connectionSecurityPlainDescription'
+ defaultMessage='Mattermost will connect and authenticate over an unsecure connection.'
+ />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <FormattedMessage
id='admin.connectionSecurityTls'
defaultMessage='TLS'
/>
@@ -66,6 +80,7 @@ export default class ConnectionSecurityDropdownSetting extends React.Component {
id='connectionSecurity'
values={[
{value: '', text: Utils.localizeMessage('admin.connectionSecurityNone', 'None')},
+ {value: 'PLAIN', text: Utils.localizeMessage('admin.connectionSecurityPlain')},
{value: 'TLS', text: Utils.localizeMessage('admin.connectionSecurityTls', 'TLS (Recommended)')},
{value: 'STARTTLS', text: Utils.localizeMessage('admin.connectionSecurityStart')}
]}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 7dfd477f0..7d502351f 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -199,6 +199,8 @@
"admin.compliance_table.userId": "Requested By",
"admin.connectionSecurityNone": "None",
"admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
+ "admin.connectionSecurityPlain": "PLAIN",
+ "admin.connectionSecurityPlainDescription": "Mattermost will connect and authenticate over an unsecure connection.",
"admin.connectionSecurityStart": "STARTTLS",
"admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
"admin.connectionSecurityTest": "Test Connection",