diff options
| author | Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com> | 2017-01-03 23:15:34 +0100 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-03 17:15:34 -0500 |
| commit | 621880569565fe0d6c015dc1a5f514bc92dac395 (patch) | |
| tree | d2d77b3f123fab44d4b7129cfefd849405d82d64 /webapp | |
| parent | 7ee1fec6bf21ab3fb63740c94cc92c2317a0092e (diff) | |
| download | chat-621880569565fe0d6c015dc1a5f514bc92dac395.tar.gz chat-621880569565fe0d6c015dc1a5f514bc92dac395.tar.bz2 chat-621880569565fe0d6c015dc1a5f514bc92dac395.zip | |
Add port 587 (used for STARTTLS) as an example SMTP port (#4893)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index bd9a530ba..9dc02857b 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -255,7 +255,7 @@ export default class EmailSettings extends AdminSettings { defaultMessage='SMTP Server Port:' /> } - placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465"')} + placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465", "587"')} helpText={ <FormattedMessage id='admin.email.smtpPortDescription' diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 55727c115..def5b117d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -281,7 +281,7 @@ "admin.email.smtpPasswordExample": "Ex: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", "admin.email.smtpPasswordTitle": "SMTP Server Password:", "admin.email.smtpPortDescription": "Port of SMTP email server.", - "admin.email.smtpPortExample": "Ex: \"25\", \"465\"", + "admin.email.smtpPortExample": "Ex: \"25\", \"465\", \"587\"", "admin.email.smtpPortTitle": "SMTP Server Port:", "admin.email.smtpServerDescription": "Location of SMTP email server.", "admin.email.smtpServerExample": "Ex: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"", |