toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLT-5810 Add missing intl key to error objects in login screen (#336)

Browse source
This commit is contained in:
Chris Duarte 2017-03-10 12:40:31 -08:00 committed by Harrison Healey
parent dca35ac418
commit f5745cbc0e
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/scenes/login/login.js
View file

@ -79,11 +79,13 @@ class Login extends Component {
this.setState({
error: {
id: msgId,
defaultMessage: '',
values: {
ldapUsername: this.props.config.LdapLoginFieldName ||
this.props.intl.formatMessage({id: 'login.ldapUsernameLower', defaultMessage: 'AD/LDAP username'})
intl: {
id: msgId,
defaultMessage: '',
values: {
ldapUsername: this.props.config.LdapLoginFieldName ||
this.props.intl.formatMessage({id: 'login.ldapUsernameLower', defaultMessage: 'AD/LDAP username'})
}
}
}
});
@ -92,7 +94,12 @@ class Login extends Component {
if (!this.props.password) {
this.setState({
error: {id: 'login.noPassword', defaultMessage: 'Please enter your password'}
error: {
intl: {
id: 'login.noPassword',
defaultMessage: 'Please enter your password'
}
}
});
return;
}