fix: password modal strings

pull/3206/head
Ryan Miller 1 year ago
parent 0a6a83547d
commit 92857101cd

@ -5,7 +5,6 @@ import { isEmpty } from 'lodash';
import { Component } from 'react'; import { Component } from 'react';
import { ToastUtils } from '../../session/utils'; import { ToastUtils } from '../../session/utils';
import { sessionPassword } from '../../state/ducks/modalDialog'; import { sessionPassword } from '../../state/ducks/modalDialog';
import { LocalizerToken } from '../../types/Localizer';
import type { PasswordAction } from '../../types/ReduxTypes'; import type { PasswordAction } from '../../types/ReduxTypes';
import { assertUnreachable } from '../../types/sqlSharedTypes'; import { assertUnreachable } from '../../types/sqlSharedTypes';
import { matchesHash, validatePassword } from '../../util/passwordUtils'; import { matchesHash, validatePassword } from '../../util/passwordUtils';
@ -67,7 +66,7 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
]; ];
break; break;
case 'remove': case 'remove':
placeholders = [window.i18n('passwordCreate')]; placeholders = [window.i18n('passwordRemove')];
break; break;
case 'enter': case 'enter':
placeholders = [window.i18n('passwordCreate')]; placeholders = [window.i18n('passwordCreate')];
@ -78,18 +77,22 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
const confirmButtonText = const confirmButtonText =
passwordAction === 'remove' ? window.i18n('remove') : window.i18n('done'); passwordAction === 'remove' ? window.i18n('remove') : window.i18n('done');
// do this separately so typescript's compiler likes it
const localizedKeyAction: LocalizerToken = const titleString = () => {
passwordAction === 'change' switch (passwordAction) {
? 'passwordChange' case 'change':
: passwordAction === 'remove' return window.i18n('passwordChange');
? 'passwordRemove' case 'remove':
: passwordAction === 'enter' return window.i18n('passwordRemove');
? 'passwordEnter' case 'enter':
: 'passwordSet'; return window.i18n('passwordEnter');
default:
return window.i18n('passwordSet');
}
};
return ( return (
<SessionWrapperModal title={window.i18n(localizedKeyAction)} onClose={this.closeDialog}> <SessionWrapperModal title={titleString()} onClose={this.closeDialog}>
<SpacerSM /> <SpacerSM />
<div className="session-modal__input-group"> <div className="session-modal__input-group">

Loading…
Cancel
Save