diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-03-13 09:28:04 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-03-13 09:28:04 +0100 |
| commit | 545462a3638212bad048e01ccfc9ece9914a0195 (patch) | |
| tree | d7af55a00a4304c86b24eaff8a0ae0d2a1ef65b8 | |
| parent | eaf1eabc7f0f2a63d583f1aba170065798cd3169 (diff) | |
| parent | 2aea6c11cfa2110abd2773ce6078542f60aba051 (diff) | |
| download | mullvadvpn-545462a3638212bad048e01ccfc9ece9914a0195.tar.xz mullvadvpn-545462a3638212bad048e01ccfc9ece9914a0195.zip | |
Merge branch 'improve-regenerate-key-error-message'
| -rw-r--r-- | gui/src/renderer/components/WireguardKeys.tsx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx index 0c6f64acde..d36e79c1b5 100644 --- a/gui/src/renderer/components/WireguardKeys.tsx +++ b/gui/src/renderer/components/WireguardKeys.tsx @@ -216,20 +216,16 @@ export default class WireguardKeys extends Component<IProps> { </Text> ); } else if (key.replacementFailure) { - let failure = ''; + let failureMessage = ''; switch (key.replacementFailure) { case 'too_many_keys': - failure = this.formatKeygenFailure('too-many-keys'); + failureMessage = this.formatKeygenFailure('too-many-keys'); break; case 'generation_failure': - failure = this.formatKeygenFailure('generation-failure'); + failureMessage = this.formatKeygenFailure('generation-failure'); break; } - const failureMessage = sprintf( - messages.pgettext('wireguard-key-view', 'Failed to replace key - %(failure)s'), - { failure }, - ); return <Text style={styles.wgkeys__invalid_key}>{failureMessage}</Text>; } else if (key.verificationFailed) { return ( @@ -263,7 +259,14 @@ export default class WireguardKeys extends Component<IProps> { private formatKeygenFailure(failure: 'too-many-keys' | 'generation-failure'): string { switch (failure) { case 'too-many-keys': - return messages.pgettext('wireguard-key-view', 'Account has too many keys already'); + // TRANSLATORS: "%(manage)" is replaced with the text in the "Manage keys" button. + return sprintf( + messages.pgettext( + 'wireguard-key-view', + 'Unable to regenerate key: you already have the maximum number of keys. To generate a new key, you first need to revoke one under “Manage keys.”', + ), + { manage: messages.pgettext('wireguard-key-view', 'Manage keys') }, + ); case 'generation-failure': return messages.pgettext('wireguard-key-view', 'Failed to generate a key'); default: |