Merge branch 'master' into spanish-translation

plone · Nov 1, 2022 · ca72faa · ca72faa
2 parents caa1d88 + d8d4482
commit ca72faa
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,12 @@
 
 ### Bugfix
 
+- Fix `schemaEnhancer` not being applied if nested `blocksConfig` is present @sneridagh
+
 ### Internal
 
+- Add translation for `pending` state @iFlameing
+
 ### Documentation
 
 ## 16.0.0-alpha.46 (2022-10-28)

diff --git a/locales/ca/LC_MESSAGES/volto.po b/locales/ca/LC_MESSAGES/volto.po
@@ -4112,6 +4112,11 @@ msgstr "o prova una pàgina diferent."
 msgid "others"
 msgstr "altres"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -4109,6 +4109,11 @@ msgstr "versuchen Sie eine andere Seite."
 msgid "others"
 msgstr "andere"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr "Ausstehend"
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po
@@ -4103,6 +4103,11 @@ msgstr ""
 msgid "others"
 msgstr ""
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/es/LC_MESSAGES/volto.po b/locales/es/LC_MESSAGES/volto.po
@@ -4114,6 +4114,11 @@ msgstr "o intente con una página diferente."
 msgid "others"
 msgstr "Otros"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/eu/LC_MESSAGES/volto.po b/locales/eu/LC_MESSAGES/volto.po
@@ -4110,6 +4110,11 @@ msgstr "edo beste orrialde bat probatu."
 msgid "others"
 msgstr "besteak"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/fr/LC_MESSAGES/volto.po b/locales/fr/LC_MESSAGES/volto.po
@@ -4120,6 +4120,11 @@ msgstr "ou essayez une autre page."
 msgid "others"
 msgstr ""
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -4103,6 +4103,11 @@ msgstr "oppure prova una pagina diversa."
 msgid "others"
 msgstr "altre"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/ja/LC_MESSAGES/volto.po b/locales/ja/LC_MESSAGES/volto.po
@@ -4111,6 +4111,11 @@ msgstr "または、他のページを試してください。"
 msgid "others"
 msgstr "その他"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/nl/LC_MESSAGES/volto.po b/locales/nl/LC_MESSAGES/volto.po
@@ -4110,6 +4110,11 @@ msgstr "of probeer een andere pagina"
 msgid "others"
 msgstr "andere"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/pt/LC_MESSAGES/volto.po b/locales/pt/LC_MESSAGES/volto.po
@@ -4111,6 +4111,11 @@ msgstr ""
 msgid "others"
 msgstr ""
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/pt_BR/LC_MESSAGES/volto.po b/locales/pt_BR/LC_MESSAGES/volto.po
@@ -4113,6 +4113,11 @@ msgstr "ou tente uma página diferente"
 msgid "others"
 msgstr "outros"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/ro/LC_MESSAGES/volto.po b/locales/ro/LC_MESSAGES/volto.po
@@ -4103,6 +4103,11 @@ msgstr "sau încercați o altă pagină."
 msgid "others"
 msgstr "altele"
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/locales/volto.pot b/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2022-10-28T09:34:03.763Z\n"
+"POT-Creation-Date: 2022-10-31T12:15:48.236Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -4105,6 +4105,11 @@ msgstr ""
 msgid "others"
 msgstr ""
 
+#: components/manage/Contents/ContentsItem
+# defaultMessage: Pending
+msgid "pending"
+msgstr ""
+
 #: components/manage/Contents/ContentsItem
 # defaultMessage: Private
 msgid "private"

diff --git a/src/components/manage/Contents/ContentsItem.jsx b/src/components/manage/Contents/ContentsItem.jsx
@@ -31,6 +31,10 @@ const messages = defineMessages({
     id: 'private',
     defaultMessage: 'Private',
   },
+  pending: {
+    id: 'pending',
+    defaultMessage: 'Pending',
+  },
   published: {
     id: 'published',
     defaultMessage: 'Published',

diff --git a/src/helpers/Extensions/withBlockSchemaEnhancer.js b/src/helpers/Extensions/withBlockSchemaEnhancer.js
@@ -257,7 +257,12 @@ export const withVariationSchemaEnhancer = (FormComponent) => (props) => {
   const blockType = formData['@type'];
   const variations = blocksConfig[blockType]?.variations || [];
 
-  let schema = applySchemaEnhancer({ schema: originalSchema, formData, intl });
+  let schema = applySchemaEnhancer({
+    schema: originalSchema,
+    formData,
+    intl,
+    blocksConfig,
+  });
 
   if (variations.length > 1) {
     addExtensionFieldToSchema({