From a51e8f6a165163b9cc37a4eb5b315cd37af17f77 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 19 Mar 2018 13:36:16 -0230
Subject: Fetch localeMessages in front end only.

---
 app/scripts/popup-core.js |  4 ++--
 app/scripts/popup.js      | 12 +-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index 5af913e98..2e4334bb1 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -11,11 +11,11 @@ const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 module.exports = initializePopup
 
 
-function initializePopup ({ container, connectionStream, localeMessages }, cb) {
+function initializePopup ({ container, connectionStream }, cb) {
   // setup app
   async.waterfall([
     (cb) => connectToAccountManager(connectionStream, cb),
-    (accountManager, cb) => launchMetamaskUi({ container, accountManager, localeMessages }, cb),
+    (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb),
   ], cb)
 }
 
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index fe6aae799..5f526759a 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -1,9 +1,3 @@
-// setup i18n
-// const Translator = require('../../ui/create-i18n')
-// const translator = new Translator()
-// global.translator = translator
-// global.getMessage = translator.getMessage.bind(translator)
-
 const injectCss = require('inject-css')
 const OldMetaMaskUiCss = require('../../old-ui/css')
 const NewMetaMaskUiCss = require('../../ui/css')
@@ -28,10 +22,6 @@ async function start() {
   const release = global.platform.getVersion()
   setupRaven({ release })
 
-  // Load translator
-  // await translator.setLocale('ja')
-  const localeMessages = await fetchLocale('ja')
-
   // inject css
   // const css = MetaMaskUiCss()
   // injectCss(css)
@@ -47,7 +37,7 @@ async function start() {
 
   // start ui
   const container = document.getElementById('app-content')
-  startPopup({ container, connectionStream, localeMessages }, (err, store) => {
+  startPopup({ container, connectionStream }, (err, store) => {
     if (err) return displayCriticalError(err)
 
     // Code commented out until we begin auto adding users to NewUI
-- 
cgit v1.2.3