Merge remote-tracking branch 'origin/master' into fix-plone6-upgrade

collective · Oct 8, 2024 · 8706cd5 · 8706cd5
2 parents 2c39b01 + cb88b05
commit 8706cd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,10 @@ Changelog
 - 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/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>