i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.

1 files changed, 7 insertions, 8 deletions

diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js
index 00b1aab8..75552924 100644
--- a/ui/app/accounts/import/index.js
+++ b/ui/app/accounts/import/index.js
@@ -2,7 +2,6 @@ const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('../../metamask-connect')
-const t = require('../../../i18n-helper').getMessage
 import Select from 'react-select'
 
 // Subviews
@@ -15,8 +14,8 @@ module.exports = connect(mapStateToProps)(AccountImportSubview)
 function mapStateToProps (state) {
   return {
     menuItems: [
-      t(this.props.localeMessages, 'privateKey'),
-      t(this.props.localeMessages, 'jsonFile'),
+      this.props.t('privateKey'),
+      this.props.t('jsonFile'),
     ],
   }
 }
@@ -36,7 +35,7 @@ AccountImportSubview.prototype.render = function () {
     h('div.new-account-import-form', [
 
       h('.new-account-import-disclaimer', [
-        h('span', t('importAccountMsg')),
+        h('span', this.props.t('importAccountMsg')),
         h('span', {
           style: {
             cursor: 'pointer',
@@ -47,12 +46,12 @@ AccountImportSubview.prototype.render = function () {
               url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
             })
           },
-        }, t('here')),
+        }, this.props.t('here')),
       ]),
 
       h('div.new-account-import-form__select-section', [
 
-        h('div.new-account-import-form__select-label', t('selectType')),
+        h('div.new-account-import-form__select-label', this.props.t('selectType')),
 
         h(Select, {
           className: 'new-account-import-form__select',
@@ -85,9 +84,9 @@ AccountImportSubview.prototype.renderImportView = function () {
   const current = type || menuItems[0]
 
   switch (current) {
-    case t(this.props.localeMessages, 'privateKey'):
+    case this.props.t('privateKey'):
       return h(PrivateKeyImportView)
-    case t(this.props.localeMessages, 'jsonFile'):
+    case this.props.t('jsonFile'):
       return h(JsonImportView)
     default:
       return h(JsonImportView)