volto/i18n-improvements: Added i18n more support for 'More component' from manage com
"Leonardo J. Caballero G" <jenkins-z4DKO/[email protected]> Mon, 16 Dec 2019 22:19:09 -0800 (PST)
| Newsgroups | gmane.comp.web.zope.plone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Repository: volto Branch: refs/heads/i18n-improvements Date: 2019-12-17T02:15:51-04:00 Author: Leonardo J. Caballero G (macagua) <[email protected]> Commit: https://github.com/plone/volto/commit/84367317441f41f307f094048840e9f46d2a3204 Added i18n more support for 'More component' from manage components and updated locales files Files changed: M locales/de/LC_MESSAGES/volto.po M locales/en/LC_MESSAGES/volto.po M locales/es/LC_MESSAGES/volto.po M locales/it/LC_MESSAGES/volto.po M locales/ja/LC_MESSAGES/volto.po M locales/nl/LC_MESSAGES/volto.po M locales/pt_BR/LC_MESSAGES/volto.po M locales/volto.pot M src/components/manage/Toolbar/More.jsx M src/components/manage/Toolbar/More.test.jsx b'diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po\nindex ce8ad6a28..87386cea8 100644\n--- a/locales/de/LC_MESSAGES/volto.po\n+++ b/locales/de/LC_MESSAGES/volto.po\n@@ -572,6 +572,7 @@ msgid "Groups"\n msgstr ""\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr ""\n \n@@ -820,6 +821,7 @@ msgstr "Pers\xc3\xb6nliche Informationen"\n msgid "Personal Preferences"\n msgstr "Meine Einstellungen"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po\nindex 2928768b1..554a90970 100644\n--- a/locales/en/LC_MESSAGES/volto.po\n+++ b/locales/en/LC_MESSAGES/volto.po\n@@ -557,6 +55 7,7 @@ msgid "Groups"\n msgstr ""\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr ""\n \n@@ -805,6 +806,7 @@ msgstr ""\n msgid "Personal Preferences"\n msgstr ""\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po\nindex b75bee6e4..43e84f53a 100644\n--- a/locales/es/LC_MESSAGES/volto.po\n+++ b/locales/es/LC_MESSAGES/volto.po\n@@ -567,6 +567,7 @@ msgid "Groups"\n msgstr "Grupos"\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr "Historial"\n \n@@ -815,6 +816,7 @@ msgstr "Informaci\xc3\xb3n Personal"\n msgid "Personal Preferences"\n msgstr "Preferencias Personales"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr "Herramientas personales"\ndiff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po\nindex 406e74968..d47fbfd14 100644\n--- a/locales/it/LC_MESSAGES/volto.po\n+++ b/locales/it/LC_MESSAGES/volto.po\n@@ -557,6 +557,7 @@ msgid "Groups"\n msgstr ""\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr ""\n \n@@ -805,6 +806,7 @@ msgstr "Informazioni Personali"\n msgid "Personal Preferences"\n msgstr "Preferenze Personali"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/ja/LC_MESSAGES/volto.po b/lo cales/ja/LC_MESSAGES/volto.po\nindex d8bcbaef7..9d2526858 100644\n--- a/locales/ja/LC_MESSAGES/volto.po\n+++ b/locales/ja/LC_MESSAGES/volto.po\n@@ -564,6 +564,7 @@ msgid "Groups"\n msgstr ""\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr ""\n \n@@ -812,6 +813,7 @@ msgstr ""\n msgid "Personal Preferences"\n msgstr "\xe5\x80\x8b\xe4\xba\xba\xe5\x88\xa5\xe8\xa8\xad\xe5\xae\x9a"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/nl/LC_MESSAGES/volto.po b/locales/nl/LC_MESSAGES/volto.po\nindex e822c8205..6f6e2023c 100644\n--- a/locales/nl/LC_MESSAGES/volto.po\n+++ b/locales/nl/LC_MESSAGES/volto.po\n@@ -576,6 +576,7 @@ msgid "Groups"\n msgstr ""\n \n # : components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr ""\n \n@@ -824,6 +825,7 @@ msgstr "Persoonlijke gegevens"\n msgid "Personal Preferences"\n msgstr "Persoonlijke voorkeuren"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/pt_BR/LC_MESSAGES/volto.po b/locales/pt_BR/LC_MESSAGES/volto.po\nindex f58aae8a3..4f232cd2a 100644\n--- a/locales/pt_BR/LC_MESSAGES/volto.po\n+++ b/locales/pt_BR/LC_MESSAGES/volto.po\n@@ -565,6 +565,7 @@ msgid "Groups"\n msgstr "Grupos"\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n msgid "History"\n msgstr "Hist\xc3\xb3rico"\n \n@@ -813,6 +814,7 @@ msgstr "Informa\xc3\xa7\xc3\xa3o Pessoal"\n msgid "Pe rsonal Preferences"\n msgstr "Prefer\xc3\xaancias Pessoais"\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n msgid "Personal tools"\n msgstr ""\ndiff --git a/locales/volto.pot b/locales/volto.pot\nindex 57be11f5f..03516bfff 100644\n--- a/locales/volto.pot\n+++ b/locales/volto.pot\n@@ -1,7 +1,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: Plone\\n"\n-"POT-Creation-Date: 2019-12-17T05:21:38.974Z\\n"\n+"POT-Creation-Date: 2019-12-17T06:08:54.395Z\\n"\n "Last-Translator: Plone i18n <[email protected]>\\n"\n "Language-Team: Plone i18n <[email protected]>\\n"\n "MIME-Version: 1.0\\n"\n@@ -673,6 +673,7 @@ msgid "Groups"\n msgstr ""\n \n #: components/manage/History/History\n+#: components/manage/Toolbar/More\n # defaultMessage: Hi story\n msgid "History"\n msgstr ""\n@@ -980,6 +981,7 @@ msgstr ""\n msgid "Personal Preferences"\n msgstr ""\n \n+#: components/manage/Toolbar/More\n #: components/manage/Toolbar/Toolbar\n # defaultMessage: Personal tools\n msgid "Personal tools"\ndiff --git a/src/components/manage/Toolbar/More.jsx b/src/components/manage/Toolbar/More.jsx\nindex a9b4b6890..257822423 100644\n--- a/src/components/manage/Toolbar/More.jsx\n+++ b/src/components/manage/Toolbar/More.jsx\n@@ -1,6 +1,13 @@\n+/**\n+ * More component.\n+ * @module components/manage/Toolbar/More\n+ */\n+\n import React, { Component } from \'react\';\n+import { defineMessages, injectIntl } from \'react-intl\';\n import PropTypes from \'prop-types\';\n import { connect } from \'react-redux\';\n+import { compose } from \'redux\';\n im port { Link } from \'react-router-dom\';\n import { find } from \'lodash\';\n \n@@ -10,6 +17,17 @@ import { getBaseUrl } from \'../../../helpers\';\n import rightArrowSVG from \'../../../icons/right-key.svg\';\n import userSVG from \'../../../icons/user.svg\';\n \n+const messages = defineMessages({\n+ personalTools: {\n+ id: \'Personal tools\',\n+ defaultMessage: \'Personal tools\',\n+ },\n+ history: {\n+ id: \'History\',\n+ defaultMessage: \'History\',\n+ },\n+});\n+\n /**\n * More container class.\n * @class More\n@@ -68,7 +86,7 @@ class More extends Component {\n <h2>{this.props.content.title}</h2>\n <button\n className="more-user"\n- aria-label="Personal tools"\n+ aria-label={this.props.intl.formatMessage(message s.personalTools)}\n onClick={() => this.push(\'personalTools\')}\n tabIndex={0}\n >\n@@ -97,7 +115,9 @@ class More extends Component {\n </button>\n </Link>\n ) : (\n- <button aria-label="History">\n+ <button\n+ aria-label={this.props.intl.formatMessage(messages.history)}\n+ >\n <div>\n <span className="pastanaga-menu-label">\n {historyAction.title}\n@@ -124,11 +144,14 @@ class More extends Component {\n }\n }\n \n-export default connect(\n- (state, props) => ({\n- actions: state.actions.actions,\n- pathname: props.pathname,\n- content: state.content.data,\n- }),\n- {},\n+e xport default compose(\n+ injectIntl,\n+ connect(\n+ (state, props) => ({\n+ actions: state.actions.actions,\n+ pathname: props.pathname,\n+ content: state.content.data,\n+ }),\n+ {},\n+ ),\n )(More);\ndiff --git a/src/components/manage/Toolbar/More.test.jsx b/src/components/manage/Toolbar/More.test.jsx\nindex a47469adf..37779fc59 100644\n--- a/src/components/manage/Toolbar/More.test.jsx\n+++ b/src/components/manage/Toolbar/More.test.jsx\n@@ -1,7 +1,7 @@\n import React from \'react\';\n import renderer from \'react-test-renderer\';\n import configureStore from \'redux-mock-store\';\n-import { Provider } from \'react-redux\';\n+import { Provider } from \'react-intl-redux\';\n import { MemoryRouter } from \'react-router-dom\';\n \n import More from \'./More\';\n@ @ -19,6 +19,10 @@ const mockStore = configureStore();\n describe(\'Toolbar More component\', () => {\n it(\'renders a Toolbar More component\', () => {\n const store = mockStore({\n+ intl: {\n+ locale: \'en\',\n+ messages: {},\n+ },\n actions: {\n actions: {\n document_actions: [],\n'