aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-28 08:17:26 +0800
committerkumavis <aaron@kumavis.me>2018-03-28 08:17:26 +0800
commitb26788e9d4be6a85e4dcca0b793a258336f41f46 (patch)
tree373bf3ef3b8d65aa0b2b2d97e0c129b62946c1dc
parent5290570c8fc635856823e8f66b8f810f07b7948a (diff)
parent2053cac69129a436d20d1392e0361554d7b16959 (diff)
downloadtangerine-wallet-browser-b26788e9d4be6a85e4dcca0b793a258336f41f46.tar.gz
tangerine-wallet-browser-b26788e9d4be6a85e4dcca0b793a258336f41f46.tar.zst
tangerine-wallet-browser-b26788e9d4be6a85e4dcca0b793a258336f41f46.zip
Merge branch 'i18n-translator-redux' of github.com:MetaMask/metamask-extension into i18n-translator-redux
-rw-r--r--ui/index.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/index.js b/ui/index.js
index fe57f791a..1e0e9f1cc 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -30,7 +30,9 @@ async function startApp (metamaskState, accountManager, opts) {
// parse opts
if (!metamaskState.featureFlags) metamaskState.featureFlags = {}
- const currentLocaleMessages = await fetchLocale(metamaskState.currentLocale)
+ const currentLocaleMessages = metamaskState.currentLocale
+ ? await fetchLocale(metamaskState.currentLocale)
+ : {}
const enLocaleMessages = await fetchLocale('en')
const store = configureStore({