Merge tag 'v4.5.5'

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

messages.jsonのローカライズ

1 files changed, 9 insertions, 3 deletions

diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js
index 8b0ce1e8b..bb7e0814c 100644
--- a/ui/app/components/notice.js
+++ b/ui/app/components/notice.js
@@ -1,12 +1,18 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
+const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
 const ReactMarkdown = require('react-markdown')
 const linker = require('extension-link-enabler')
 const findDOMNode = require('react-dom').findDOMNode
-const t = require('../../i18n')
+const connect = require('react-redux').connect
+
+Notice.contextTypes = {
+  t: PropTypes.func,
+}
+
+module.exports = connect()(Notice)
 
-module.exports = Notice
 
 inherits(Notice, Component)
 function Notice () {
@@ -111,7 +117,7 @@ Notice.prototype.render = function () {
         style: {
           marginTop: '18px',
         },
-      }, t('accept')),
+      }, this.context.t('accept')),
     ])
   )
 }