diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
| commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
| tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /webapp/i18n/en.json | |
| parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
| download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip | |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index ae902e3f8..448cb436d 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -725,7 +725,7 @@ "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "E.g.: \"30\"", "admin.service.siteURL": "Site URL:", - "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.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.", "admin.service.siteURLExample": "E.g.: \"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.", @@ -1310,6 +1310,10 @@ "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew.</a>", "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.", "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured", + "error_bar.site_url": "{docsLink} is now a required setting. Please configure it in {link}.", + "error_bar.site_url.docsLink": "Site URL", + "error_bar.site_url.link": "the System Console", + "error_bar.site_url_gitlab": "{docsLink} is now a required setting. Please configure it in the System Console or in gitlab.rb if you're using GitLab Mattermost.", "file_attachment.download": "Download", "file_info_preview.size": "Size ", "file_info_preview.type": "File type ", |