diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-07 14:19:37 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-04-07 19:19:37 +0100 |
| commit | 9318ffcdf3caf77d66e0b9fc7967d9de9ea99b4b (patch) | |
| tree | 6410b8da9d1155259b1ad488b08f73af4cb9ea12 /webapp | |
| parent | 8dbb297b3e0a00deb2eb31333b9b1bde37d90543 (diff) | |
| download | chat-9318ffcdf3caf77d66e0b9fc7967d9de9ea99b4b.tar.gz chat-9318ffcdf3caf77d66e0b9fc7967d9de9ea99b4b.tar.bz2 chat-9318ffcdf3caf77d66e0b9fc7967d9de9ea99b4b.zip | |
PLT-6263 Updated timing and text of Site URL warning bar (#6016)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/error_bar.jsx | 12 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/webapp/components/error_bar.jsx b/webapp/components/error_bar.jsx index 146b4955e..341f0efb4 100644 --- a/webapp/components/error_bar.jsx +++ b/webapp/components/error_bar.jsx @@ -49,12 +49,12 @@ export default class ErrorBar extends React.Component { const errorIgnored = ErrorStore.getIgnoreNotification(); if (!errorIgnored) { - if (global.mm_config.SendEmailNotifications === 'false') { - ErrorStore.storeLastError({notification: true, message: Utils.localizeMessage('error_bar.preview_mode', 'Preview Mode: Email notifications have not been configured')}); - return; - } else if (isSystemAdmin && global.mm_config.SiteURL === '') { + if (isSystemAdmin && global.mm_config.SiteURL === '') { ErrorStore.storeLastError({notification: true, message: SITE_URL_ERROR}); return; + } else if (global.mm_config.SendEmailNotifications === 'false') { + ErrorStore.storeLastError({notification: true, message: Utils.localizeMessage('error_bar.preview_mode', 'Preview Mode: Email notifications have not been configured')}); + return; } } @@ -178,10 +178,10 @@ export default class ErrorBar extends React.Component { let defaultMessage; if (global.mm_config.EnableSignUpWithGitLab === 'true') { id = 'error_bar.site_url_gitlab'; - defaultMessage = '{docsLink} is now a required setting. Please configure it in the System Console or in gitlab.rb if you\'re using GitLab Mattermost.'; + defaultMessage = 'Please configure your {docsLink} in the System Console or in gitlab.rb if you\'re using GitLab Mattermost.'; } else { id = 'error_bar.site_url'; - defaultMessage = '{docsLink} is now a required setting. Please configure it in {link}.'; + defaultMessage = 'Please configure your {docsLink} in the System Console.'; } message = ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 800600c99..dae89692a 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1304,10 +1304,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": "Please configure your {docsLink} in the {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.", + "error_bar.site_url.link": "System Console", + "error_bar.site_url_gitlab": "Please configure your {docsLink} 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 ", |