Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support

1 files changed, 4 insertions, 1 deletions

diff --git a/ui/app/i18n-provider.js b/ui/app/i18n-provider.js
index 2856e0ed6..d46911f7c 100644
--- a/ui/app/i18n-provider.js
+++ b/ui/app/i18n-provider.js
@@ -8,8 +8,11 @@ const t = require('../i18n-helper').getMessage
 class I18nProvider extends Component {
   getChildContext () {
     const { localeMessages } = this.props
+    const { current, en } = localeMessages
     return {
-      t: t.bind(null, localeMessages),
+      t (key, ...args) {
+        return t(current, key, ...args) || t(en, key, ...args) || `[${key}]`
+      },
     }
   }