From bad70eb1b328aa911a2523ccab642d7607161b4b Mon Sep 17 00:00:00 2001
From: Nick Doiron <ndoiron@mapmeld.com>
Date: Mon, 22 Jan 2018 23:48:03 -1000
Subject: first steps to i18n

---
 ui/app/components/account-menu/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui/app/components/account-menu/index.js')

diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index aeb8a0b38..aec00ff6b 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -70,10 +70,10 @@ AccountMenu.prototype.render = function () {
     h(Item, {
       className: 'account-menu__header',
     }, [
-      'My Accounts',
+      t('myAccounts'),
       h('button.account-menu__logout-button', {
         onClick: lockMetamask,
-      }, 'Log out'),
+      }, t('logout')),
     ]),
     h(Divider),
     h('div.account-menu__accounts', this.renderAccounts()),
@@ -81,23 +81,23 @@ AccountMenu.prototype.render = function () {
     h(Item, {
       onClick: () => showNewAccountPage('CREATE'),
       icon: h('img', { src: 'images/plus-btn-white.svg' }),
-      text: 'Create Account',
+      text: t('createAccount'),
     }),
     h(Item, {
       onClick: () => showNewAccountPage('IMPORT'),
       icon: h('img', { src: 'images/import-account.svg' }),
-      text: 'Import Account',
+      text: t('importAccount'),
     }),
     h(Divider),
     h(Item, {
       onClick: showInfoPage,
       icon: h('img', { src: 'images/mm-info-icon.svg' }),
-      text: 'Info & Help',
+      text: t('infoHelp'),
     }),
     h(Item, {
       onClick: showConfigPage,
       icon: h('img', { src: 'images/settings.svg' }),
-      text: 'Settings',
+      text: t('settings'),
     }),
   ])
 }
@@ -155,6 +155,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) {
   try { // Sometimes keyrings aren't loaded yet:
     const type = keyring.type
     const isLoose = type !== 'HD Key Tree'
-    return isLoose ? h('.keyring-label', 'IMPORTED') : null
+    return isLoose ? h('.keyring-label', t('importedCaps')) : null
   } catch (e) { return }
 }
-- 
cgit v1.2.3


From 7da52c599784130a5f7b6737f5b017bd3a95c1ed Mon Sep 17 00:00:00 2001
From: Nick Doiron <ndoiron@mapmeld.com>
Date: Wed, 24 Jan 2018 10:10:28 -1000
Subject: separate out cross-browser i18n for extensions

---
 ui/app/components/account-menu/index.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/components/account-menu/index.js')

diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index aec00ff6b..9c7b6b15a 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -6,6 +6,7 @@ const actions = require('../../actions')
 const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu')
 const Identicon = require('../identicon')
 const { formatBalance } = require('../../util')
+const t = require('../../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu)
 
-- 
cgit v1.2.3


From abfa74f09a0119345165a32090d88a1d95df6c80 Mon Sep 17 00:00:00 2001
From: Nick Doiron <ndoiron@mapmeld.com>
Date: Mon, 29 Jan 2018 15:29:01 -0500
Subject: complete i18n across new UI

---
 ui/app/components/account-menu/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/account-menu/index.js')

diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 9c7b6b15a..d9cf8cdce 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -156,6 +156,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) {
   try { // Sometimes keyrings aren't loaded yet:
     const type = keyring.type
     const isLoose = type !== 'HD Key Tree'
-    return isLoose ? h('.keyring-label', t('importedCaps')) : null
+    return isLoose ? h('.keyring-label.allcaps', t('imported')) : null
   } catch (e) { return }
 }
-- 
cgit v1.2.3


From 2420ad2477f7b688295a55c038b3473a4516dc52 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 6 Mar 2018 22:26:13 -0330
Subject: Correct merge conflict resolution errors.

---
 ui/app/components/account-menu/index.js | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'ui/app/components/account-menu/index.js')

diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 043e3d8d1..e838e8916 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -95,13 +95,6 @@ AccountMenu.prototype.render = function () {
       icon: h('img', { src: 'images/mm-info-icon.svg' }),
       text: t('infoHelp'),
     }),
-    h(Item, {
-      onClick: showConfigPage,
-      icon: h('img', { src: 'images/settings.svg' }),
-      text: t('settings'),
-      icon: h('img.account-menu__item-icon', { src: 'images/mm-info-icon.svg' }),
-      text: t('infoHelp'),
-    }),
     h(Item, {
       onClick: showConfigPage,
       icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),
-- 
cgit v1.2.3