Merge pull request #3609 from MetaMask/i18n-translator-redux

Handle i18n with redux.

1 files changed, 13 insertions, 14 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index d1b17ab5d..d23238bab 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -1,10 +1,9 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('react-redux').connect
+const connect = require('./metamask-connect')
 const h = require('react-hyperscript')
 const actions = require('./actions')
 const classnames = require('classnames')
-const t = require('../i18n')
 
 // mascara
 const MascaraFirstTime = require('../../mascara/src/app/first-time').default
@@ -294,8 +293,8 @@ App.prototype.renderAppBar = function () {
 
             // metamask name
             h('.flex-row', [
-              h('h1', t('appName')),
-              h('div.beta-label', t('beta')),
+              h('h1', this.props.t('appName')),
+              h('div.beta-label', this.props.t('beta')),
             ]),
           ]),
 
@@ -557,15 +556,15 @@ App.prototype.getConnectingLabel = function () {
   let name
 
   if (providerName === 'mainnet') {
-    name = t('connectingToMainnet')
+    name = this.props.t('connectingToMainnet')
   } else if (providerName === 'ropsten') {
-    name = t('connectingToRopsten')
+    name = this.props.t('connectingToRopsten')
   } else if (providerName === 'kovan') {
-    name = t('connectingToRopsten')
+    name = this.props.t('connectingToRopsten')
   } else if (providerName === 'rinkeby') {
-    name = t('connectingToRinkeby')
+    name = this.props.t('connectingToRinkeby')
   } else {
-    name = t('connectingToUnknown')
+    name = this.props.t('connectingToUnknown')
   }
 
   return name
@@ -578,15 +577,15 @@ App.prototype.getNetworkName = function () {
   let name
 
   if (providerName === 'mainnet') {
-    name = t('mainnet')
+    name = this.props.t('mainnet')
   } else if (providerName === 'ropsten') {
-    name = t('ropsten')
+    name = this.props.t('ropsten')
   } else if (providerName === 'kovan') {
-    name = t('kovan')
+    name = this.props.t('kovan')
   } else if (providerName === 'rinkeby') {
-    name = t('rinkeby')
+    name = this.props.t('rinkeby')
   } else {
-    name = t('unknownNetwork')
+    name = this.props.t('unknownNetwork')
   }
 
   return name