Merge tag 'v4.5.5'

# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ

1 files changed, 8 insertions, 3 deletions

diff --git a/ui/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js
index 9ffc669a2..d98909baa 100644
--- a/ui/app/accounts/import/seed.js
+++ b/ui/app/accounts/import/seed.js
@@ -1,11 +1,16 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
 const h = require('react-hyperscript')
+const PropTypes = require('prop-types')
 const connect = require('react-redux').connect
-const t = require('../../../i18n')
+
+SeedImportSubview.contextTypes = {
+  t: PropTypes.func,
+}
 
 module.exports = connect(mapStateToProps)(SeedImportSubview)
 
+
 function mapStateToProps (state) {
   return {}
 }
@@ -21,10 +26,10 @@ SeedImportSubview.prototype.render = function () {
       style: {
       },
     }, [
-      t('pasteSeed'),
+      this.context.t('pasteSeed'),
       h('textarea'),
       h('br'),
-      h('button', t('submit')),
+      h('button', this.context.t('submit')),
     ])
   )
 }