diff options
| -rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 6 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index b41aa4397..db976e041 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -6,7 +6,7 @@ import React from 'react'; import * as Utils from 'utils/utils.jsx'; import AdminSettings from './admin_settings.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import SettingsGroup from './settings_group.jsx'; import TextSetting from './text_setting.jsx'; import ReloadConfigButton from './reload_config.jsx'; @@ -67,9 +67,9 @@ export default class ConfigurationSettings extends AdminSettings { } placeholder={Utils.localizeMessage('admin.service.siteURLExample', 'Ex "https://mattermost.example.com:1234"')} helpText={ - <FormattedMessage + <FormattedHTMLMessage id='admin.service.siteURLDescription' - defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.' + defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.' /> } value={this.state.siteURL} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index d4894f704..e50c709f0 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -660,7 +660,7 @@ "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "Ex \"30\"", "admin.service.siteURL": "Site URL:", - "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.", + "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.", "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"", "admin.service.ssoSessionDays": "Session length SSO (days):", "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.", |