From c5f3290cb1ce665fad2e0b2a862fe1d6a60bd94c Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Fri, 14 May 2021 17:29:26 -0700
Subject: [PATCH] Fixing unlocalized strings (#11102)

* Fixing unlocalized strings

Fixes MetaMask/metamask-extension#11094

* Removing aggregrate bullet from modal

* Updating bullet point keys
---
 app/_locales/en/messages.json                 | 12 +++
 .../confirm-remove-account.component.js       | 14 ++--
 .../metametrics-opt-in-modal.component.js     | 73 ++++++++++---------
 .../signature-request-original.component.js   |  5 +-
 .../transaction-list.component.js             |  2 +-
 .../metametrics-opt-in.component.js           |  4 +-
 6 files changed, 64 insertions(+), 46 deletions(-)

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 (
       <div className="confirm-remove-account__account">
@@ -36,12 +37,14 @@ export default class ConfirmRemoveAccount extends Component {
           <Identicon address={identity.address} diameter={32} />
         </div>
         <div className="confirm-remove-account__account__name">
-          <span className="confirm-remove-account__account__label">Name</span>
+          <span className="confirm-remove-account__account__label">
+            {t('name')}
+          </span>
           <span className="account_value">{identity.name}</span>
         </div>
         <div className="confirm-remove-account__account__address">
           <span className="confirm-remove-account__account__label">
-            Public Address
+            {t('publicAddress')}
           </span>
           <span className="account_value">
             {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')}
           >
-            <img
-              src="images/popout.svg"
-              alt={this.context.t('etherscanView')}
-            />
+            <img src="images/popout.svg" alt={t('etherscanView')} />
           </a>
         </div>
       </div>
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 {
               <img src="images/metrics-chart.svg" alt="" />
             </div>
             <div className="metametrics-opt-in__title">
-              Help Us Improve MetaMask
+              {t('metametricsHelpImproveMetaMask')}
             </div>
             <div className="metametrics-opt-in__body">
               <div className="metametrics-opt-in__description">
-                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')}
               </div>
               <div className="metametrics-opt-in__description">
-                MetaMask will..
+                {t('metametricsCommitmentsIntro')}
               </div>
 
               <div className="metametrics-opt-in__committments">
                 <div className="metametrics-opt-in__row">
                   <i className="fa fa-check" />
                   <div className="metametrics-opt-in__row-description">
-                    Always allow you to opt-out via Settings
+                    {t('metametricsCommitmentsAllowOptOut')}
                   </div>
                 </div>
                 <div className="metametrics-opt-in__row">
                   <i className="fa fa-check" />
                   <div className="metametrics-opt-in__row-description">
-                    Send anonymized click & pageview events
-                  </div>
-                </div>
-                <div className="metametrics-opt-in__row">
-                  <i className="fa fa-check" />
-                  <div className="metametrics-opt-in__row-description">
-                    Maintain a public aggregate dashboard to educate the
-                    community
+                    {t('metametricsCommitmentsSendAnonymizedEvents')}
                   </div>
                 </div>
                 <div className="metametrics-opt-in__row metametrics-opt-in__break-row">
                   <i className="fa fa-times" />
                   <div className="metametrics-opt-in__row-description">
-                    <span className="metametrics-opt-in__bold">Never</span>{' '}
-                    collect keys, addresses, transactions, balances, hashes, or
-                    any personal information
+                    {t('metametricsCommitmentsNeverCollectKeysEtc', [
+                      <span
+                        className="metametrics-opt-in__bold"
+                        key="neverCollectKeys"
+                      >
+                        {t('metametricsCommitmentsBoldNever')}
+                      </span>,
+                    ])}
                   </div>
                 </div>
                 <div className="metametrics-opt-in__row">
                   <i className="fa fa-times" />
                   <div className="metametrics-opt-in__row-description">
-                    <span className="metametrics-opt-in__bold">Never</span>{' '}
-                    collect your full IP address
+                    {t('metametricsCommitmentsNeverCollectIP', [
+                      <span
+                        className="metametrics-opt-in__bold"
+                        key="neverCollectIP"
+                      >
+                        {t('metametricsCommitmentsBoldNever')}
+                      </span>,
+                    ])}
                   </div>
                 </div>
                 <div className="metametrics-opt-in__row">
                   <i className="fa fa-times" />
                   <div className="metametrics-opt-in__row-description">
-                    <span className="metametrics-opt-in__bold">Never</span> sell
-                    data for profit. Ever!
+                    {t('metametricsCommitmentsNeverSellDataForProfit', [
+                      <span
+                        className="metametrics-opt-in__bold"
+                        key="neverSellData"
+                      >
+                        {t('metametricsCommitmentsBoldNever')}
+                      </span>,
+                    ])}
                   </div>
                 </div>
               </div>
             </div>
             <div className="metametrics-opt-in__bottom-text">
-              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&nbsp;
-              <a
-                href="https://metamask.io/privacy.html"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Privacy Policy here
-              </a>
-              .
+              {t('gdprMessage', [
+                <a
+                  key="metametrics-bottom-text-wrapper"
+                  href="https://metamask.io/privacy.html"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {t('gdprMessagePrivacyPolicy')}
+                </a>,
+              ])}
             </div>
           </div>
           <div className="metametrics-opt-in__footer">
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 (
       <div className="request-signature__typed-container">
         {domain ? (
           <div>
-            <h1>Domain</h1>
+            <h1>{t('domain')}</h1>
             <ObjectInspector data={domain} expandLevel={1} name="domain" />
           </div>
         ) : (
@@ -201,7 +202,7 @@ export default class SignatureRequestOriginal extends Component {
         )}
         {message ? (
           <div>
-            <h1>Message</h1>
+            <h1>{t('message')}</h1>
             <ObjectInspector data={message} expandLevel={1} name="message" />
           </div>
         ) : (
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')}
             </Button>
           )}
         </div>
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', [
                     <span
                       className="metametrics-opt-in__bold"
-                      key="neverCollectKeys"
+                      key="neverCollectIP"
                     >
                       {t('metametricsCommitmentsBoldNever')}
                     </span>,
@@ -90,7 +90,7 @@ export default class MetaMetricsOptIn extends Component {
                   {t('metametricsCommitmentsNeverSellDataForProfit', [
                     <span
                       className="metametrics-opt-in__bold"
-                      key="neverCollectKeys"
+                      key="neverSellData"
                     >
                       {t('metametricsCommitmentsBoldNever')}
                     </span>,