diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-04-16 13:45:49 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-04-16 13:45:49 +0200 |
| commit | 43125627582e38127bc8599ef5655d4e505d6b5c (patch) | |
| tree | 15dea4e2d7e404967ba5215e5abee5f881ddd7c2 | |
| parent | 31663e2fe538d5de4b59363298629b092cd2129e (diff) | |
| parent | a5178f98c06a5df18c2ec4731670a8ba5f83f34f (diff) | |
| download | mullvadvpn-43125627582e38127bc8599ef5655d4e505d6b5c.tar.xz mullvadvpn-43125627582e38127bc8599ef5655d4e505d6b5c.zip | |
Merge branch 'fix-login-titles'
| -rw-r--r-- | gui/src/renderer/components/Login.tsx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gui/src/renderer/components/Login.tsx b/gui/src/renderer/components/Login.tsx index 2991f7aa26..a69f5db48c 100644 --- a/gui/src/renderer/components/Login.tsx +++ b/gui/src/renderer/components/Login.tsx @@ -212,11 +212,17 @@ export default class Login extends Component<IProps, IState> { private formTitle() { switch (this.props.loginState.type) { case 'logging in': - return messages.pgettext('login-view', 'Logging in...'); + return this.props.loginState.method === 'existing_account' + ? messages.pgettext('login-view', 'Logging in...') + : messages.pgettext('login-view', 'Creating account...'); case 'failed': - return messages.pgettext('login-view', 'Login failed'); + return this.props.loginState.method === 'existing_account' + ? messages.pgettext('login-view', 'Login failed') + : messages.pgettext('login-view', 'Error'); case 'ok': - return messages.pgettext('login-view', 'Logged in'); + return this.props.loginState.method === 'existing_account' + ? messages.pgettext('login-view', 'Logged in') + : messages.pgettext('login-view', 'Account created'); default: return messages.pgettext('login-view', 'Login'); } @@ -231,11 +237,11 @@ export default class Login extends Component<IProps, IState> { case 'logging in': return this.props.loginState.method === 'existing_account' ? messages.pgettext('login-view', 'Checking account number') - : messages.pgettext('login-view', 'Creating new account'); + : messages.pgettext('login-view', 'Please wait'); case 'ok': return this.props.loginState.method === 'existing_account' - ? messages.pgettext('login-view', 'Correct account number') - : messages.pgettext('login-view', 'Account created'); + ? messages.pgettext('login-view', 'Valid account number') + : messages.pgettext('login-view', 'Logged in'); default: return messages.pgettext('login-view', 'Enter your account number'); } |