Merge tag 'v4.5.5'

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

messages.jsonのローカライズ

1 files changed, 12 insertions, 6 deletions

diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js
index a43d44f89..75303a34a 100644
--- a/ui/app/components/hex-as-decimal-input.js
+++ b/ui/app/components/hex-as-decimal-input.js
@@ -1,12 +1,18 @@
 const Component = require('react').Component
+const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const extend = require('xtend')
-const t = require('../../i18n')
+const connect = require('react-redux').connect
+
+HexAsDecimalInput.contextTypes = {
+  t: PropTypes.func,
+}
+
+module.exports = connect()(HexAsDecimalInput)
 
-module.exports = HexAsDecimalInput
 
 inherits(HexAsDecimalInput, Component)
 function HexAsDecimalInput () {
@@ -127,13 +133,13 @@ HexAsDecimalInput.prototype.constructWarning = function () {
   let message = name ? name + ' ' : ''
 
   if (min && max) {
-    message += t('betweenMinAndMax', [min, max])
+    message += this.context.t('betweenMinAndMax', [min, max])
   } else if (min) {
-    message += t('greaterThanMin', [min])
+    message += this.context.t('greaterThanMin', [min])
   } else if (max) {
-    message += t('lessThanMax', [max])
+    message += this.context.t('lessThanMax', [max])
   } else {
-    message += t('invalidInput')
+    message += this.context.t('invalidInput')
   }
 
   return message