Menu
▾
▴
[Plone-cvs] volto/hero: Merge branch 'master' into spanish-translation
|
From: Leonardo J. C. G <je...@pl...> - 2022-11-08 19:48:27
|
Repository: volto Branch: refs/heads/hero Date: 2022-10-31T21:41:25-04:00 Author: Leonardo J. Caballero G (macagua) <leo...@gm...> Commit: https://github.com/plone/volto/commit/ca72faa3317447c73bfcaf47162479a09670892e Merge branch 'master' into spanish-translation Files changed: M CHANGELOG.md M locales/ca/LC_MESSAGES/volto.po M locales/de/LC_MESSAGES/volto.po M locales/en/LC_MESSAGES/volto.po M locales/es/LC_MESSAGES/volto.po M locales/eu/LC_MESSAGES/volto.po M locales/fr/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/LC_MESSAGES/volto.po M locales/pt_BR/LC_MESSAGES/volto.po M locales/ro/LC_MESSAGES/volto.po M locales/volto.pot M src/components/manage/Contents/ContentsItem.jsx M src/helpers/Extensions/withBlockSchemaEnhancer.js b'diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 5b69d057fa..741716511d 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -11,8 +11,12 @@\n \n ### Bugfix\n \n+- Fix `schemaEnhancer` not being applied if nested `blocksConfig` is present @sneridagh\n+\n ### Internal\n \n+- Add translation for `pending` state @iFlameing\n+\n ### Documentation\n \n ## 16.0.0-alpha.46 (2022-10-28)\ndiff --git a/locales/ca/LC_MESSAGES/volto.po b/locales/ca/LC_MESSAGES/volto.po\nindex 491098be5c..c3cc0553bb 100644\n--- a/locales/ca/LC_MESSAGES/volto.po\n+++ b/locales/ca/LC_MESSAGES/volto.po\n@@ -4112,6 +4112,11 @@ msgstr "o prova una p\xc3\xa0gina diferent."\n msgid "others"\n msgstr "altres"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po\nindex 4db2193abe..fbe45c6fb2 100644\n--- a/locales/de/LC_MESSAGES/volto.po\n+++ b/locales/de/LC_MESSAGES/volto.po\n@@ -4109,6 +4109,11 @@ msgstr "versuchen Sie eine andere Seite."\n msgid "others"\n msgstr "andere"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr "Ausstehend"\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po\nindex 382fb7123f..94321327ba 100644\n--- a/locales/en/LC_MESSAGES/volto.po\n+++ b/locales/en/LC_MESSAGES/volto.po\n@@ -4103,6 +4103,11 @@ msgstr ""\n msgid "others"\n msgstr ""\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po\nindex 743bf0193d..a8a828e33d 100644\n--- a/locales/es/LC_MESSAGES/volto.po\n+++ b/locales/es/LC_MESSAGES/volto.po\n@@ -4114,6 +4114,11 @@ msgstr "o intente con una p\xc3\xa1gina diferente."\n msgid "others"\n msgstr "Otros"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/eu/LC_MESSAGES/volto.po b/locales/eu/LC_MESSAGES/volto.po\nindex 3c5b4c3d2a..d2e2e8516e 100644\n--- a/locales/eu/LC_MESSAGES/volto.po\n+++ b/locales/eu/LC_MESSAGES/volto.po\n@@ -4110,6 +4110,11 @@ msgstr "edo beste orrialde bat probatu."\n msgid "others"\n msgstr "besteak"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po\nindex d286fbc521..785aceb82d 100644\n--- a/locales/fr/LC_MESSAGES/volto.po\n+++ b/locales/fr/LC_MESSAGES/volto.po\n@@ -4120,6 +4120,11 @@ msgstr "ou essayez une autre page."\n msgid "others"\n msgstr ""\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po\nindex ef5c7a73de..e327d0417d 100644\n--- a/locales/it/LC_MESSAGES/volto.po\n+++ b/locales/it/LC_MESSAGES/volto.po\n@@ -4103,6 +4103,11 @@ msgstr "oppure prova una pagina diversa."\n msgid "others"\n msgstr "altre"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/ja/LC_MESSAGES/volto.po b/locales/ja/LC_MESSAGES/volto.po\nindex 6757199f1e..8565df1c92 100644\n--- a/locales/ja/LC_MESSAGES/volto.po\n+++ b/locales/ja/LC_MESSAGES/volto.po\n@@ -4111,6 +4111,11 @@ msgstr "\xe3\x81\xbe\xe3\x81\x9f\xe3\x81\xaf\xe3\x80\x81\xe4\xbb\x96\xe3\x81\xae\xe3\x83\x9a\xe3\x83\xbc\xe3\x82\xb8\xe3\x82\x92\xe8\xa9\xa6\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82"\n msgid "others"\n msgstr "\xe3\x81\x9d\xe3\x81\xae\xe4\xbb\x96"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/nl/LC_MESSAGES/volto.po b/locales/nl/LC_MESSAGES/volto.po\nindex f7457e8c93..2be6c782df 100644\n--- a/locales/nl/LC_MESSAGES/volto.po\n+++ b/locales/nl/LC_MESSAGES/volto.po\n@@ -4110,6 +4110,11 @@ msgstr "of probeer een andere pagina"\n msgid "others"\n msgstr "andere"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/pt/LC_MESSAGES/volto.po b/locales/pt/LC_MESSAGES/volto.po\nindex 79df3b237c..bcc4617259 100644\n--- a/locales/pt/LC_MESSAGES/volto.po\n+++ b/locales/pt/LC_MESSAGES/volto.po\n@@ -4111,6 +4111,11 @@ msgstr ""\n msgid "others"\n msgstr ""\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/pt_BR/LC_MESSAGES/volto.po b/locales/pt_BR/LC_MESSAGES/volto.po\nindex 8718eedb8b..630db56f11 100644\n--- a/locales/pt_BR/LC_MESSAGES/volto.po\n+++ b/locales/pt_BR/LC_MESSAGES/volto.po\n@@ -4113,6 +4113,11 @@ msgstr "ou tente uma p\xc3\xa1gina diferente"\n msgid "others"\n msgstr "outros"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/ro/LC_MESSAGES/volto.po b/locales/ro/LC_MESSAGES/volto.po\nindex cccb93caf8..7e5d682ef2 100644\n--- a/locales/ro/LC_MESSAGES/volto.po\n+++ b/locales/ro/LC_MESSAGES/volto.po\n@@ -4103,6 +4103,11 @@ msgstr "sau \xc3\xaencerca\xc8\x9bi o alt\xc4\x83 pagin\xc4\x83."\n msgid "others"\n msgstr "altele"\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/locales/volto.pot b/locales/volto.pot\nindex 1071e942e2..e014185cd6 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: 2022-10-28T09:34:03.763Z\\n"\n+"POT-Creation-Date: 2022-10-31T12:15:48.236Z\\n"\n "Last-Translator: Plone i18n <plo...@li...>\\n"\n "Language-Team: Plone i18n <plo...@li...>\\n"\n "MIME-Version: 1.0\\n"\n@@ -4105,6 +4105,11 @@ msgstr ""\n msgid "others"\n msgstr ""\n \n+#: components/manage/Contents/ContentsItem\n+# defaultMessage: Pending\n+msgid "pending"\n+msgstr ""\n+\n #: components/manage/Contents/ContentsItem\n # defaultMessage: Private\n msgid "private"\ndiff --git a/src/components/manage/Contents/ContentsItem.jsx b/src/components/manage/Contents/ContentsItem.jsx\nindex 8cc2bdf238..a0adba5d74 100644\n--- a/src/components/manage/Contents/ContentsItem.jsx\n+++ b/src/components/manage/Contents/ContentsItem.jsx\n@@ -31,6 +31,10 @@ const messages = defineMessages({\n id: \'private\',\n defaultMessage: \'Private\',\n },\n+ pending: {\n+ id: \'pending\',\n+ defaultMessage: \'Pending\',\n+ },\n published: {\n id: \'published\',\n defaultMessage: \'Published\',\ndiff --git a/src/helpers/Extensions/withBlockSchemaEnhancer.js b/src/helpers/Extensions/withBlockSchemaEnhancer.js\nindex 22b0e4d72c..69b9f8abba 100644\n--- a/src/helpers/Extensions/withBlockSchemaEnhancer.js\n+++ b/src/helpers/Extensions/withBlockSchemaEnhancer.js\n@@ -257,7 +257,12 @@ export const withVariationSchemaEnhancer = (FormComponent) => (props) => {\n const blockType = formData[\'@type\'];\n const variations = blocksConfig[blockType]?.variations || [];\n \n- let schema = applySchemaEnhancer({ schema: originalSchema, formData, intl });\n+ let schema = applySchemaEnhancer({\n+ schema: originalSchema,\n+ formData,\n+ intl,\n+ blocksConfig,\n+ });\n \n if (variations.length > 1) {\n addExtensionFieldToSchema({\n' |