From 34aeef50a0519576da64f23d65afdfbfa278273d Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 14 Mar 2018 16:31:45 -0700
Subject: i18n - load locales manually

---
 ui/app/components/modals/account-modal-container.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/modals/account-modal-container.js')

diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js
index 08540aa76..964677244 100644
--- a/ui/app/components/modals/account-modal-container.js
+++ b/ui/app/components/modals/account-modal-container.js
@@ -5,7 +5,7 @@ const connect = require('react-redux').connect
 const actions = require('../../actions')
 const { getSelectedIdentity } = require('../../selectors')
 const Identicon = require('../identicon')
-const t = require('../../../i18n')
+const t = global.getMessage
 
 function mapStateToProps (state) {
   return {
-- 
cgit v1.2.3


From 5fe0be722b6514692a68e920ee8058c5d572237d Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 15 Mar 2018 21:59:45 -0230
Subject: Handle i18n with redux.

---
 ui/app/components/modals/account-modal-container.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/components/modals/account-modal-container.js')

diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js
index 964677244..ac6457b37 100644
--- a/ui/app/components/modals/account-modal-container.js
+++ b/ui/app/components/modals/account-modal-container.js
@@ -1,11 +1,11 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const { getSelectedIdentity } = require('../../selectors')
 const Identicon = require('../identicon')
-const t = global.getMessage
+const t = require('../../../i18n-helper').getMessage
 
 function mapStateToProps (state) {
   return {
@@ -60,7 +60,7 @@ AccountModalContainer.prototype.render = function () {
 
         h('i.fa.fa-angle-left.fa-lg'),
 
-        h('span.account-modal-back__text', ' ' + t('back')),
+        h('span.account-modal-back__text', ' ' + t(this.props.localeMessages, 'back')),
 
       ]),
 
-- 
cgit v1.2.3


From d24a0590d363dbe88d383c8faec8eb28809242f0 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 21 Mar 2018 22:11:47 -0230
Subject: i18n redux solution doesn't require importing t() and passing state
 to each t() call; t is just available on props.

---
 ui/app/components/modals/account-modal-container.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ui/app/components/modals/account-modal-container.js')

diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js
index ac6457b37..70efe16cb 100644
--- a/ui/app/components/modals/account-modal-container.js
+++ b/ui/app/components/modals/account-modal-container.js
@@ -5,7 +5,6 @@ const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const { getSelectedIdentity } = require('../../selectors')
 const Identicon = require('../identicon')
-const t = require('../../../i18n-helper').getMessage
 
 function mapStateToProps (state) {
   return {
@@ -60,7 +59,7 @@ AccountModalContainer.prototype.render = function () {
 
         h('i.fa.fa-angle-left.fa-lg'),
 
-        h('span.account-modal-back__text', ' ' + t(this.props.localeMessages, 'back')),
+        h('span.account-modal-back__text', ' ' + this.props.t('back')),
 
       ]),
 
-- 
cgit v1.2.3