Merge branch 'collective:master' into plone6_template_fixes

collective · Dec 10, 2024 · 784f77f · 784f77f
2 parents bb94900 + 5ad2c16
commit 784f77f
Show file tree

Hide file tree

Showing 15 changed files with 2,475 additions and 2,449 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,12 +2,26 @@ Changelog
 =========
 
 
-4.2.1 (unreleased)
+4.2.2 (unreleased)
 ------------------
 
+- Pin version `Products.validation>=3.0.0`
+  [petschki]
+
+
+4.2.1 (2024-10-08)
+------------------
+
+- Fix Plone 5 related upgrade steps in Plone 6.
+  [thet]
+
 - Add plone.shortname behaviour to EasyForm type.
   [ThibautBorn]
 
+- Include the Products.validation ZCML to load the proper translation catalog.
+  Refs. `issue 434 <https://github.com/collective/collective.easyform/issues/434>`_.
+  [ale-rt]
+
 
 4.2.0 (2024-03-15)
 ------------------

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 
-version = "4.2.1.dev0"
+version = "4.2.2.dev0"
 
 setup(
     name="collective.easyform",
@@ -50,7 +50,7 @@
         "plone.supermodel",
         "plone.restapi",
         "Products.CMFPlone>=6.0.0b1",
-        "Products.validation",
+        "Products.validation>=3.0.0",
         "setuptools",
         "six",
         # -*- Extra requirements: -*-

diff --git a/src/collective/easyform/configure.zcml b/src/collective/easyform/configure.zcml
@@ -6,6 +6,7 @@
     >
 
   <include package="plone.app.dexterity" />
+  <include package="Products.validation" />
 
   <configure zcml:condition="installed plone.formwidget.recaptcha">"
     <include package="plone.formwidget.recaptcha" />
@@ -26,7 +27,7 @@
 
   <include package=".browser" />
   <include package=".upgrades" />
-  <include zcml:condition="installed Products.PloneFormGen" package=".migration" /> 
+  <include zcml:condition="installed Products.PloneFormGen" package=".migration" />
 
   <genericsetup:registerProfile
       name="default"
@@ -57,15 +58,15 @@
       name="collective.easyform-hiddenprofiles"
       factory=".setuphandlers.HiddenProfiles"
       />
-    
+
   <adapter
     zcml:condition="installed plone.restapi"
 	  factory="collective.easyform.serializer.SerializeToJson"
 	  />
-  
+
   <adapter
     zcml:condition="installed plone.restapi"
-	  factory="collective.easyform.serializer.DeserializeFromJson" 
+	  factory="collective.easyform.serializer.DeserializeFromJson"
 	  />
 
 </configure>