3 files changed, 81 insertions, 59 deletions

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 39d15fd83..dc7da90d0 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -11,6 +11,7 @@ class PreferencesController {
       tokens: [],
       useBlockie: false,
       featureFlags: {},
+      currentLocale: 'ja',
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
@@ -24,6 +25,10 @@ class PreferencesController {
     return this.store.getState().useBlockie
   }
 
+  setCurrentLocale (key) {
+    this.store.updateState({ currentLocale: key })
+  }
+
   setSelectedAddress (_address) {
     return new Promise((resolve, reject) => {
       const address = normalizeAddress(_address)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0a5c1d36f..4ff08e029 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -333,6 +333,7 @@ module.exports = class MetamaskController extends EventEmitter {
       getState: (cb) => cb(null, this.getState()),
       setCurrentCurrency: this.setCurrentCurrency.bind(this),
       setUseBlockie: this.setUseBlockie.bind(this),
+      setCurrentLocale: this.setCurrentLocale.bind(this),
       markAccountsFound: this.markAccountsFound.bind(this),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
@@ -920,6 +921,15 @@ module.exports = class MetamaskController extends EventEmitter {
     }
   }
 
+  setCurrentLocale (key, cb) {
+    try {
+      this.preferencesController.setCurrentLocale(key)
+      cb(null)
+    } catch (err) {
+      cb(err)
+    }
+  }
+
   recordFirstTimeInfo (initState) {
     if (!('firstTimeInfo' in initState)) {
       initState.firstTimeInfo = {
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index 11d50ee87..5f526759a 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -9,69 +9,76 @@ const ExtensionPlatform = require('./platforms/extension')
 const NotificationManager = require('./lib/notification-manager')
 const notificationManager = new NotificationManager()
 const setupRaven = require('./lib/setupRaven')
+const { fetchLocale } = require('../../ui/i18n-helper.js')
 
-// create platform global
-global.platform = new ExtensionPlatform()
-
-// setup sentry error reporting
-const release = global.platform.getVersion()
-setupRaven({ release })
-
-// inject css
-// const css = MetaMaskUiCss()
-// injectCss(css)
-
-// identify window type (popup, notification)
-const windowType = isPopupOrNotification()
-global.METAMASK_UI_TYPE = windowType
-closePopupIfOpen(windowType)
-
-// setup stream to background
-const extensionPort = extension.runtime.connect({ name: windowType })
-const connectionStream = new PortStream(extensionPort)
-
-// start ui
-const container = document.getElementById('app-content')
-startPopup({ container, connectionStream }, (err, store) => {
-  if (err) return displayCriticalError(err)
-
-  // Code commented out until we begin auto adding users to NewUI
-  // const { isMascara, identities = {}, featureFlags = {} } = store.getState().metamask
-  // const firstTime = Object.keys(identities).length === 0
-  const { isMascara, featureFlags = {} } = store.getState().metamask
-  let betaUIState = featureFlags.betaUI
-
-  // Code commented out until we begin auto adding users to NewUI
-  // const useBetaCss = isMascara || firstTime || betaUIState
-  const useBetaCss = isMascara || betaUIState
-
-  let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-  let deleteInjectedCss = injectCss(css)
-  let newBetaUIState
-
-  store.subscribe(() => {
-    const state = store.getState()
-    newBetaUIState = state.metamask.featureFlags.betaUI
-    if (newBetaUIState !== betaUIState) {
-      deleteInjectedCss()
-      betaUIState = newBetaUIState
-      css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-      deleteInjectedCss = injectCss(css)
-    }
-    if (state.appState.shouldClose) notificationManager.closePopup()
+start().catch(log.error)
+
+async function start() {
+
+  // create platform global
+  global.platform = new ExtensionPlatform()
+
+  // setup sentry error reporting
+  const release = global.platform.getVersion()
+  setupRaven({ release })
+
+  // inject css
+  // const css = MetaMaskUiCss()
+  // injectCss(css)
+
+  // identify window type (popup, notification)
+  const windowType = isPopupOrNotification()
+  global.METAMASK_UI_TYPE = windowType
+  closePopupIfOpen(windowType)
+
+  // setup stream to background
+  const extensionPort = extension.runtime.connect({ name: windowType })
+  const connectionStream = new PortStream(extensionPort)
+
+  // start ui
+  const container = document.getElementById('app-content')
+  startPopup({ container, connectionStream }, (err, store) => {
+    if (err) return displayCriticalError(err)
+
+    // Code commented out until we begin auto adding users to NewUI
+    // const { isMascara, identities = {}, featureFlags = {} } = store.getState().metamask
+    // const firstTime = Object.keys(identities).length === 0
+    const { isMascara, featureFlags = {} } = store.getState().metamask
+    let betaUIState = featureFlags.betaUI
+
+    // Code commented out until we begin auto adding users to NewUI
+    // const useBetaCss = isMascara || firstTime || betaUIState
+    const useBetaCss = isMascara || betaUIState
+
+    let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
+    let deleteInjectedCss = injectCss(css)
+    let newBetaUIState
+
+    store.subscribe(() => {
+      const state = store.getState()
+      newBetaUIState = state.metamask.featureFlags.betaUI
+      if (newBetaUIState !== betaUIState) {
+        deleteInjectedCss()
+        betaUIState = newBetaUIState
+        css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
+        deleteInjectedCss = injectCss(css)
+      }
+      if (state.appState.shouldClose) notificationManager.closePopup()
+    })
   })
-})
 
 
-function closePopupIfOpen (windowType) {
-  if (windowType !== 'notification') {
-    notificationManager.closePopup()
+  function closePopupIfOpen (windowType) {
+    if (windowType !== 'notification') {
+      notificationManager.closePopup()
+    }
+  }
+
+  function displayCriticalError (err) {
+    container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>'
+    container.style.height = '80px'
+    log.error(err.stack)
+    throw err
   }
-}
 
-function displayCriticalError (err) {
-  container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>'
-  container.style.height = '80px'
-  log.error(err.stack)
-  throw err
 }