diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 46ff14080..c062bd8d5 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -562,6 +562,9 @@ "dismissReminderField": { "message": "Dismiss recovery phrase backup reminder" }, + "domain": { + "message": "Domain" + }, "done": { "message": "Done" }, @@ -1117,6 +1120,9 @@ "myAccounts": { "message": "My Accounts" }, + "name": { + "message": "Name" + }, "needEtherInWallet": { "message": "To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet." }, @@ -1416,6 +1422,9 @@ "provide": { "message": "Provide" }, + "publicAddress": { + "message": "Public Address" + }, "queue": { "message": "Queue" }, @@ -2356,6 +2365,9 @@ "viewContact": { "message": "View Contact" }, + "viewMore": { + "message": "View More" + }, "viewOnCustomBlockExplorer": { "message": "View at $1" }, diff --git a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js index decdc329f..4a7785d4d 100644 --- a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js +++ b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js @@ -29,6 +29,7 @@ export default class ConfirmRemoveAccount extends Component { }; renderSelectedAccount() { + const { t } = this.context; const { identity } = this.props; return (
@@ -36,12 +37,14 @@ export default class ConfirmRemoveAccount extends Component {
- Name + + {t('name')} + {identity.name}
- Public Address + {t('publicAddress')} {addressSummary(identity.address, 4, 4)} @@ -57,12 +60,9 @@ export default class ConfirmRemoveAccount extends Component { )} target="_blank" rel="noopener noreferrer" - title={this.context.t('etherscanView')} + title={t('etherscanView')} > - {this.context.t('etherscanView')} + {t('etherscanView')}
diff --git a/ui/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js b/ui/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js index 833d8b49d..9daf60e56 100644 --- a/ui/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js +++ b/ui/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js @@ -27,76 +27,81 @@ export default class MetaMetricsOptInModal extends Component {
- Help Us Improve MetaMask + {t('metametricsHelpImproveMetaMask')}
- MetaMask would like to gather usage data to better understand - how our users interact with the extension. This data will be - used to continually improve the usability and user experience of - our product and the Ethereum ecosystem. + {t('metametricsOptInDescription')}
- MetaMask will.. + {t('metametricsCommitmentsIntro')}
- Always allow you to opt-out via Settings + {t('metametricsCommitmentsAllowOptOut')}
- Send anonymized click & pageview events -
-
-
- -
- Maintain a public aggregate dashboard to educate the - community + {t('metametricsCommitmentsSendAnonymizedEvents')}
- Never{' '} - collect keys, addresses, transactions, balances, hashes, or - any personal information + {t('metametricsCommitmentsNeverCollectKeysEtc', [ + + {t('metametricsCommitmentsBoldNever')} + , + ])}
- Never{' '} - collect your full IP address + {t('metametricsCommitmentsNeverCollectIP', [ + + {t('metametricsCommitmentsBoldNever')} + , + ])}
- Never sell - data for profit. Ever! + {t('metametricsCommitmentsNeverSellDataForProfit', [ + + {t('metametricsCommitmentsBoldNever')} + , + ])}
- This data is aggregated and is therefore anonymous for the - purposes of General Data Protection Regulation (EU) 2016/679. For - more information in relation to our privacy practices, please see - our  - - Privacy Policy here - - . + {t('gdprMessage', [ + + {t('gdprMessagePrivacyPolicy')} + , + ])}
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js index 07ef225cc..091916cc5 100644 --- a/ui/components/app/signature-request-original/signature-request-original.component.js +++ b/ui/components/app/signature-request-original/signature-request-original.component.js @@ -188,12 +188,13 @@ export default class SignatureRequestOriginal extends Component { }; renderTypedData = (data) => { + const { t } = this.context; const { domain, message } = JSON.parse(data); return (
{domain ? (
-

Domain

+

{t('domain')}

) : ( @@ -201,7 +202,7 @@ export default class SignatureRequestOriginal extends Component { )} {message ? (
-

Message

+

{t('message')}

) : ( diff --git a/ui/components/app/transaction-list/transaction-list.component.js b/ui/components/app/transaction-list/transaction-list.component.js index 6e05a40ea..bfd294000 100644 --- a/ui/components/app/transaction-list/transaction-list.component.js +++ b/ui/components/app/transaction-list/transaction-list.component.js @@ -159,7 +159,7 @@ export default function TransactionList({ rounded onClick={viewMore} > - View More + {t('viewMore')} )}
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js index 5e3be989b..4e13ca634 100644 --- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js +++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js @@ -77,7 +77,7 @@ export default class MetaMetricsOptIn extends Component { {t('metametricsCommitmentsNeverCollectIP', [ {t('metametricsCommitmentsBoldNever')} , @@ -90,7 +90,7 @@ export default class MetaMetricsOptIn extends Component { {t('metametricsCommitmentsNeverSellDataForProfit', [ {t('metametricsCommitmentsBoldNever')} ,