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/dropdowns/token-menu-dropdown.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui/app/components/dropdowns/token-menu-dropdown.js')

diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index a4f93b505..392f43c35 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -3,7 +3,8 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
 const actions = require('../../actions')
-const t = require('../../../i18n')
+const t = global.getMessage
+
 
 module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown)
 
-- 
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/dropdowns/token-menu-dropdown.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/components/dropdowns/token-menu-dropdown.js')

diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index 392f43c35..403d17591 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -1,9 +1,9 @@
 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 t = global.getMessage
+const t = require('../../../i18n-helper').getMessage
 
 
 module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown)
@@ -45,7 +45,7 @@ TokenMenuDropdown.prototype.render = function () {
             showHideTokenConfirmationModal(this.props.token)
             this.props.onClose()
           },
-        }, t('hideToken')),
+        }, t(this.props.localeMessages, 'hideToken')),
 
       ]),
     ]),
-- 
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/dropdowns/token-menu-dropdown.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ui/app/components/dropdowns/token-menu-dropdown.js')

diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index 403d17591..630e1f99d 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -3,7 +3,6 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n-helper').getMessage
 
 
 module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown)
@@ -45,7 +44,7 @@ TokenMenuDropdown.prototype.render = function () {
             showHideTokenConfirmationModal(this.props.token)
             this.props.onClose()
           },
-        }, t(this.props.localeMessages, 'hideToken')),
+        }, this.props.t('hideToken')),
 
       ]),
     ]),
-- 
cgit v1.2.3