summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-01-30 14:44:56 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-01-31 09:40:31 +0100
commite4c9c4246654329bd8e92910af928c021d9af642 (patch)
treeeef92c2941727d2a3b0741e6caaabde4006c48a2
parent1c19d571fd94dabacec31f94cdbba1fe98bafa7b (diff)
downloadmullvadvpn-e4c9c4246654329bd8e92910af928c021d9af642.tar.xz
mullvadvpn-e4c9c4246654329bd8e92910af928c021d9af642.zip
Change default message in ClipboardLabel to the one used in Account
-rw-r--r--gui/src/renderer/components/Account.tsx1
-rw-r--r--gui/src/renderer/components/ClipboardLabel.tsx3
-rw-r--r--gui/src/renderer/components/WireguardKeys.tsx6
3 files changed, 3 insertions, 7 deletions
diff --git a/gui/src/renderer/components/Account.tsx b/gui/src/renderer/components/Account.tsx
index 2f16a722d6..1390f78370 100644
--- a/gui/src/renderer/components/Account.tsx
+++ b/gui/src/renderer/components/Account.tsx
@@ -50,7 +50,6 @@ export default class Account extends Component<IProps> {
<ClipboardLabel
style={styles.account__row_value}
value={this.props.accountToken || ''}
- message={messages.pgettext('account-view', 'COPIED TO CLIPBOARD!')}
/>
</View>
diff --git a/gui/src/renderer/components/ClipboardLabel.tsx b/gui/src/renderer/components/ClipboardLabel.tsx
index e801538c29..3a4f96d0a1 100644
--- a/gui/src/renderer/components/ClipboardLabel.tsx
+++ b/gui/src/renderer/components/ClipboardLabel.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Clipboard, Component, Text, Types } from 'reactxp';
+import { messages } from '../../shared/gettext';
interface IProps {
value: string;
@@ -16,7 +17,7 @@ interface IState {
export default class ClipboardLabel extends Component<IProps, IState> {
public static defaultProps: Partial<IProps> = {
delay: 3000,
- message: 'Copied!',
+ message: messages.gettext('COPIED TO CLIPBOARD!'),
};
public state: IState = {
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index cbc19909d9..4451b8e341 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -171,11 +171,7 @@ export default class WireguardKeys extends Component<IProps> {
return (
<View title={this.props.keyState.key.publicKey}>
<Text style={styles.wgkeys__row_value}>
- <ClipboardLabel
- value={publicKey}
- displayValue={publicKey.substring(0, 20) + '...'}
- message={messages.pgettext('account-view', 'COPIED TO CLIPBOARD!')}
- />
+ <ClipboardLabel value={publicKey} displayValue={publicKey.substring(0, 20) + '...'} />
</Text>
</View>
);