3 files changed, 69 insertions, 7 deletions

diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 17f25a04c..435eff036 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -339,7 +339,10 @@ class EmailSettings extends React.Component {
                                     defaultChecked={this.props.config.EmailSettings.EnableSignInWithEmail}
                                     onChange={this.handleChange.bind(this, 'allowSignInWithEmail_true')}
                                 />
-                                    {'true'}
+                                <FormattedMessage
+                                    id='admin.email.true'
+                                    defaultMessage='true'
+                                />
                             </label>
                             <label className='radio-inline'>
                                 <input
@@ -349,7 +352,10 @@ class EmailSettings extends React.Component {
                                     defaultChecked={!this.props.config.EmailSettings.EnableSignInWithEmail}
                                     onChange={this.handleChange.bind(this, 'allowSignInWithEmail_false')}
                                 />
-                                    {'false'}
+                                <FormattedMessage
+                                    id='admin.email.false'
+                                    defaultMessage='false'
+                                />
                             </label>
                             <p className='help-text'>
                                 <FormattedMessage
@@ -380,7 +386,10 @@ class EmailSettings extends React.Component {
                                     defaultChecked={this.props.config.EmailSettings.EnableSignInWithUsername}
                                     onChange={this.handleChange.bind(this, 'allowSignInWithUsername_true')}
                                 />
-                                    {'true'}
+                                <FormattedMessage
+                                    id='admin.email.true'
+                                    defaultMessage='true'
+                                />
                             </label>
                             <label className='radio-inline'>
                                 <input
@@ -390,7 +399,10 @@ class EmailSettings extends React.Component {
                                     defaultChecked={!this.props.config.EmailSettings.EnableSignInWithUsername}
                                     onChange={this.handleChange.bind(this, 'allowSignInWithUsername_false')}
                                 />
-                                    {'false'}
+                                <FormattedMessage
+                                    id='admin.email.false'
+                                    defaultMessage='false'
+                                />
                             </label>
                             <p className='help-text'>
                                 <FormattedMessage
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index 712d6885f..15571ad93 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -15,7 +15,40 @@ import PreferenceStore from '../stores/preference_store.jsx';
 import * as Utils from '../utils/utils.jsx';
 import Constants from '../utils/constants.jsx';
 
-export default class ChannelLoader extends React.Component {
+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.'
+    },
+    someone: {
+        id: 'channel_loader.someone',
+        defaultMessage: 'Someone'
+    },
+    posted: {
+        id: 'channel_loader.posted',
+        defaultMessage: 'Posted'
+    },
+    uploadedImage: {
+        id: 'channel_loader.uploadedImage',
+        defaultMessage: ' uploaded an image'
+    },
+    uploadedFile: {
+        id: 'channel_loader.uploadedFile',
+        defaultMessage: ' uploaded a file'
+    },
+    something: {
+        id: 'channel_loader.something',
+        defaultMessage: ' did something new'
+    },
+    wrote: {
+        id: 'channel_loader.wrote',
+        defaultMessage: ' wrote: '
+    }
+});
+
+class ChannelLoader extends React.Component {
     constructor(props) {
         super(props);
 
@@ -23,6 +56,17 @@ export default class ChannelLoader extends React.Component {
 
         this.onSocketChange = this.onSocketChange.bind(this);
 
+        const {formatMessage} = this.props.intl;
+        SocketStore.setTranslations({
+            socketError: formatMessage(holders.socketError),
+            someone: formatMessage(holders.someone),
+            posted: formatMessage(holders.posted),
+            uploadedImage: formatMessage(holders.uploadedImage),
+            uploadedFile: formatMessage(holders.uploadedFile),
+            something: formatMessage(holders.something),
+            wrote: formatMessage(holders.wrote)
+        });
+
         this.state = {};
     }
     componentDidMount() {
@@ -126,3 +170,9 @@ export default class ChannelLoader extends React.Component {
         return <div/>;
     }
 }
+
+ChannelLoader.propTypes = {
+    intl: intlShape.isRequired
+};
+
+export default injectIntl(ChannelLoader);
\ No newline at end of file
diff --git a/web/react/components/login_username.jsx b/web/react/components/login_username.jsx
index f787490fa..4bd9254c6 100644
--- a/web/react/components/login_username.jsx
+++ b/web/react/components/login_username.jsx
@@ -89,9 +89,9 @@ export default class LoginUsername extends React.Component {
                 }
             },
             (err) => {
-                if (err.message === 'api.user.login.not_verified.app_error') {
+                if (err.id === 'api.user.login.not_verified.app_error') {
                     state.serverError = formatMessage(holders.verifyEmailError);
-                } else if (err.message === 'store.sql_user.get_by_username.app_error') {
+                } else if (err.id === 'store.sql_user.get_by_username.app_error') {
                     state.serverError = formatMessage(holders.userNotFoundError);
                 } else {
                     state.serverError = err.message;