2 files changed, 20 insertions, 8 deletions

diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index 174c8c4e1..2aa28d5c4 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -20,31 +20,31 @@ import {intlShape, injectIntl, defineMessages} from 'mm-intl';
 const holders = defineMessages({
     socketError: {
         id: 'channel_loader.socketError',
-        defaultMessage: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.'
+        defaultMessage: SocketStore.getDefaultTranslations().socketError
     },
     someone: {
         id: 'channel_loader.someone',
-        defaultMessage: 'Someone'
+        defaultMessage: SocketStore.getDefaultTranslations().someone
     },
     posted: {
         id: 'channel_loader.posted',
-        defaultMessage: 'Posted'
+        defaultMessage: SocketStore.getDefaultTranslations().posted
     },
     uploadedImage: {
         id: 'channel_loader.uploadedImage',
-        defaultMessage: ' uploaded an image'
+        defaultMessage: SocketStore.getDefaultTranslations().uploadedImage
     },
     uploadedFile: {
         id: 'channel_loader.uploadedFile',
-        defaultMessage: ' uploaded a file'
+        defaultMessage: SocketStore.getDefaultTranslations().uploadedFile
     },
     something: {
         id: 'channel_loader.something',
-        defaultMessage: ' did something new'
+        defaultMessage: SocketStore.getDefaultTranslations().something
     },
     wrote: {
         id: 'channel_loader.wrote',
-        defaultMessage: ' wrote: '
+        defaultMessage: SocketStore.getDefaultTranslations().wrote
     }
 });
 
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 7e911f09a..5442f7ac4 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -234,7 +234,10 @@ class UserSettingsModal extends React.Component {
 
     render() {
         const {formatMessage} = this.props.intl;
+        var currentUser = UserStore.getCurrentUser();
+        var isAdmin = Utils.isAdmin(currentUser.roles);
         var tabs = [];
+
         tabs.push({name: 'general', uiName: formatMessage(holders.general), icon: 'glyphicon glyphicon-cog'});
         tabs.push({name: 'security', uiName: formatMessage(holders.security), icon: 'glyphicon glyphicon-lock'});
         tabs.push({name: 'notifications', uiName: formatMessage(holders.notifications), icon: 'glyphicon glyphicon-exclamation-sign'});
@@ -243,8 +246,17 @@ class UserSettingsModal extends React.Component {
         }
 
         if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') {
-            tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'});
+            var show = global.window.mm_config.EnableOnlyAdminIntegrations !== 'true';
+
+            if (global.window.mm_config.EnableOnlyAdminIntegrations === 'true' && isAdmin) {
+                show = true;
+            }
+
+            if (show) {
+                tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'});
+            }
         }
+
         tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'});
         tabs.push({name: 'advanced', uiName: formatMessage(holders.advanced), icon: 'glyphicon glyphicon-list-alt'});