Merge branch 'master' into PLT-1429

2 files changed, 17 insertions, 5 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/admin_console/ldap_settings.jsx b/web/react/components/admin_console/ldap_settings.jsx
index bc13b3bcd..535c264dd 100644
--- a/web/react/components/admin_console/ldap_settings.jsx
+++ b/web/react/components/admin_console/ldap_settings.jsx
@@ -164,7 +164,7 @@ class LdapSettings extends React.Component {
                     <div className='banner__content'>
                         <FormattedHTMLMessage
                             id='admin.ldap.noLicense'
-                            defaultMessage='<h4 className="banner__heading">Note:</h4><p>LDAP is an enterprise feature. Your current license does not support LDAP. Click <a href="http://mattermost.com"target="_blank">here</a> for information and pricing on enterprise licenses.</p>'
+                            defaultMessage='<h4 class="banner__heading">Note:</h4><p>LDAP is an enterprise feature. Your current license does not support LDAP. Click <a href="http://mattermost.com"target="_blank">here</a> for information and pricing on enterprise licenses.</p>'
                         />
                     </div>
                 </div>