1 files changed, 19 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..1d8f9c1dc 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -54,7 +54,7 @@ var holders = defineMessages({
     },
     pushServerEx: {
         id: 'admin.email.pushServerEx',
-        defaultMessage: 'E.g.: "https://push-test.mattermost.com"'
+        defaultMessage: 'E.g.: "http://push-test.mattermost.com"'
     },
     testing: {
         id: 'admin.email.testing',
@@ -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
@@ -906,7 +918,7 @@ class EmailSettings extends React.Component {
                             <p className='help-text'>
                                 <FormattedMessage
                                     id='admin.email.pushServerDesc'
-                                    defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'
+                                    defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'
                                 />
                             </p>
                         </div>
@@ -942,4 +954,4 @@ EmailSettings.propTypes = {
     config: React.PropTypes.object
 };
 
-export default injectIntl(EmailSettings);
\ No newline at end of file
+export default injectIntl(EmailSettings);