4 files changed, 27 insertions, 28 deletions

diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js
index c1b190e3d..ab5344dc6 100644
--- a/ui/app/accounts/import/index.js
+++ b/ui/app/accounts/import/index.js
@@ -1,24 +1,22 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
-const t = require('../../../i18n')
+const connect = require('../../metamask-connect')
 import Select from 'react-select'
 
 // Subviews
 const JsonImportView = require('./json.js')
 const PrivateKeyImportView = require('./private-key.js')
 
-const menuItems = [
-  t('privateKey'),
-  t('jsonFile'),
-]
 
 module.exports = connect(mapStateToProps)(AccountImportSubview)
 
 function mapStateToProps (state) {
   return {
-    menuItems,
+    menuItems: [
+      t(this.props.localeMessages, 'privateKey'),
+      t(this.props.localeMessages, 'jsonFile'),
+    ],
   }
 }
 
@@ -86,9 +84,9 @@ AccountImportSubview.prototype.renderImportView = function () {
   const current = type || menuItems[0]
 
   switch (current) {
-    case t('privateKey'):
+    case t(this.props.localeMessages, 'privateKey'):
       return h(PrivateKeyImportView)
-    case t('jsonFile'):
+    case t(this.props.localeMessages, 'jsonFile'):
       return h(JsonImportView)
     default:
       return h(JsonImportView)
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 1b5e485d7..b3f412e98 100644
--- a/ui/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
@@ -1,10 +1,11 @@
 const Component = require('react').Component
 const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
 const FileInput = require('react-simple-file-input').default
-const t = require('../../../i18n')
+const t = require('../../../i18n-helper').getMessage
+
 
 const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts'
 
@@ -24,11 +25,11 @@ class JsonImportSubview extends Component {
     return (
       h('div.new-account-import-form__json', [
 
-        h('p', t('usedByClients')),
+        h('p', t(this.props.localeMessages, 'usedByClients')),
         h('a.warning', {
           href: HELP_LINK,
           target: '_blank',
-        }, t('fileImportFail')),
+        }, t(this.props.localeMessages, 'fileImportFail')),
 
         h(FileInput, {
           readAs: 'text',
@@ -43,7 +44,7 @@ class JsonImportSubview extends Component {
 
         h('input.new-account-import-form__input-password', {
           type: 'password',
-          placeholder: t('enterPassword'),
+          placeholder: t(this.props.localeMessages, 'enterPassword'),
           id: 'json-password-box',
           onKeyPress: this.createKeyringOnEnter.bind(this),
         }),
@@ -53,13 +54,13 @@ class JsonImportSubview extends Component {
           h('button.new-account-create-form__button-cancel', {
             onClick: () => this.props.goHome(),
           }, [
-            t('cancel'),
+            t(this.props.localeMessages, 'cancel'),
           ]),
 
           h('button.new-account-create-form__button-create', {
             onClick: () => this.createNewKeychain(),
           }, [
-            t('import'),
+            t(this.props.localeMessages, 'import'),
           ]),
 
         ]),
@@ -91,7 +92,7 @@ class JsonImportSubview extends Component {
     const { fileContents } = state
 
     if (!fileContents) {
-      const message = t('needImportFile')
+      const message = t(this.props.localeMessages, 'needImportFile')
       return this.props.displayWarning(message)
     }
 
@@ -99,10 +100,10 @@ class JsonImportSubview extends Component {
     const password = passwordInput.value
 
     if (!password) {
-      const message = t('needImportPassword')
+      const message = t(this.props.localeMessages, 'needImportPassword')
       return this.props.displayWarning(message)
     }
-    
+
     this.props.importNewJsonAccount([ fileContents, password ])
   }
 }
diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js
index bc9e9384e..9a23b791a 100644
--- a/ui/app/accounts/import/private-key.js
+++ b/ui/app/accounts/import/private-key.js
@@ -1,9 +1,9 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../../metamask-connect')
 const actions = require('../../actions')
-const t = require('../../../i18n')
+const t = require('../../../i18n-helper').getMessage
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(PrivateKeyImportView)
 
@@ -34,7 +34,7 @@ PrivateKeyImportView.prototype.render = function () {
   return (
     h('div.new-account-import-form__private-key', [
 
-      h('span.new-account-create-form__instruction', t('pastePrivateKey')),
+      h('span.new-account-create-form__instruction', t(this.props.localeMessages, 'pastePrivateKey')),
 
       h('div.new-account-import-form__private-key-password-container', [
 
@@ -51,13 +51,13 @@ PrivateKeyImportView.prototype.render = function () {
         h('button.new-account-create-form__button-cancel.allcaps', {
           onClick: () => goHome(),
         }, [
-          t('cancel'),
+          t(this.props.localeMessages, 'cancel'),
         ]),
 
         h('button.new-account-create-form__button-create.allcaps', {
           onClick: () => this.createNewKeychain(),
         }, [
-          t('import'),
+          t(this.props.localeMessages, 'import'),
         ]),
 
       ]),
diff --git a/ui/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js
index 9ffc669a2..d701feedc 100644
--- a/ui/app/accounts/import/seed.js
+++ b/ui/app/accounts/import/seed.js
@@ -1,8 +1,8 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
-const t = require('../../../i18n')
+const connect = require('../../metamask-connect')
+const t = require('../../../i18n-helper').getMessage
 
 module.exports = connect(mapStateToProps)(SeedImportSubview)
 
@@ -21,10 +21,10 @@ SeedImportSubview.prototype.render = function () {
       style: {
       },
     }, [
-      t('pasteSeed'),
+      t(this.props.localeMessages, 'pasteSeed'),
       h('textarea'),
       h('br'),
-      h('button', t('submit')),
+      h('button', t(this.props.localeMessages, 'submit')),
     ])
   )
 }