imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2924 from jryans/password-on-server-name

Browse source 
Test `defaultServerName` before showing it on forgot password
This commit is contained in:
J. Ryan Stinnett 2019-04-17 15:23:03 +01:00 • committed by GitHub
commit 65784afb91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/auth/ForgotPassword.js
View file

@ -222,7 +222,7 @@ module.exports = React.createClass({
} }
let yourMatrixAccountText = _t('Your Matrix account'); let yourMatrixAccountText = _t('Your Matrix account');
if (this.state.enteredHsUrl === this.props.defaultHsUrl) { if (this.state.enteredHsUrl === this.props.defaultHsUrl && this.props.defaultServerName) {
yourMatrixAccountText = _t('Your Matrix account on %(serverName)s', { yourMatrixAccountText = _t('Your Matrix account on %(serverName)s', {
serverName: this.props.defaultServerName, serverName: this.props.defaultServerName,
}); });