imio.smartweb.common 1.2.15__py3-none-any.whl → 1.2.17__py3-none-any.whl

imio/smartweb/common/behaviors/topics.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectFieldWidget
 from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.supermodel import model
@@ -21,4 +21,4 @@ class ITopics(model.Schema):
         default=[],
         required=False,
     )
-    directives.widget(topics=AjaxSelectFieldWidget)
+    directives.widget(topics=TranslatedAjaxSelectFieldWidget)

imio/smartweb/common/subscribers.py

@@ -8,10 +8,36 @@ from plone.app.dexterity.behaviors.metadata import IBasic
 from plone.app.textfield.value import IRichTextValue
 from plone.app.textfield.value import RichTextValue
 from plone.dexterity.utils import iterSchemata
+from plone.registry.interfaces import IRegistry
+from Products.CMFPlone.resources.browser.resource import update_resource_registry_mtime
+from zope.component import queryUtility
+from zope.component.hooks import setSite
 from zope.lifecycleevent.interfaces import IAttributes
 from zope.schema import getFields
 
 import DateTime
+import os
+import Zope2
+
+
+def started_zope(event):
+    db = Zope2.DB
+    connection = db.open()
+    zope_app = connection.root().get("Application", None)
+    site_id = os.getenv("SITE_ID", "Plone")
+    try:
+        site = zope_app.unrestrictedTraverse(site_id)
+    except KeyError:
+        # This happens when there is no site (ex: tests setups)
+        return
+    setSite(site)
+    registry = queryUtility(IRegistry)
+    if registry is None:
+        # This happens for example during site creation
+        return
+    # update resource registry time to invalidate its cache at startup
+    # this information is also used as ETag
+    update_resource_registry_mtime()
 
 
 def reindex_breadcrumb(obj, event):

imio/smartweb/common/subscribers.zcml

@@ -1,6 +1,9 @@
 <configure
     xmlns="http://namespaces.zope.org/zope">
 
+  <subscriber for="zope.processlifetime.IProcessStarting"
+              handler=".subscribers.started_zope"/>
+
   <subscriber for="plone.dexterity.interfaces.IDexterityContent
                    zope.lifecycleevent.interfaces.IObjectAddedEvent"
               handler=".subscribers.added_content" />

imio/smartweb/common/tests/test_widgets.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
+from plone.api import portal as portal_api
+from zope.publisher.browser import TestRequest
+
+import mock
+import unittest
+
+
+class TestVocabulary(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = TestRequest()
+
+    def test_translated_ajax_select(self):
+        portal_api.get_current_language = mock.Mock(return_value="fr")
+        widget = TranslatedAjaxSelectWidget(self.request)
+        widget.update()
+        self.assertEqual(
+            {
+                "name": None,
+                "value": "",
+                "pattern": "select2",
+                "pattern_options": {"separator": ";"},
+            },
+            widget._base_args(),
+        )
+
+        widget.vocabulary = "imio.smartweb.vocabulary.Topics"
+        self.assertEqual(
+            widget._base_args(),
+            {
+                "name": None,
+                "value": "",
+                "pattern": "select2",
+                "pattern_options": {
+                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                    "separator": ";",
+                },
+            },
+        )
+        widget.value = "entertainment"
+        self.assertEqual(
+            widget._base_args(),
+            {
+                "name": None,
+                "value": "entertainment",
+                "pattern": "select2",
+                "pattern_options": {
+                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                    "initialValues": {
+                        "entertainment": "Activités et divertissement",
+                    },
+                    "separator": ";",
+                },
+            },
+        )

imio/smartweb/common/widgets/select.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+from plone import api
+from plone.app.z3cform.widget import AjaxSelectWidget
+from z3c.form.interfaces import IFieldWidget
+from z3c.form.widget import FieldWidget
+from zope.interface import implementer
+from zope.i18n import translate
+
+
+class TranslatedAjaxSelectWidget(AjaxSelectWidget):
+    """Translated Ajax select widget for z3c.form."""
+
+    def _ajaxselect_options(self):
+        options = super(TranslatedAjaxSelectWidget, self)._ajaxselect_options()
+        current_lang = api.portal.get_current_language()[:2]
+        translated_initial_values = {}
+        for token, value in list(options.get("initialValues", {}).items()):
+            translated_initial_values[token] = translate(
+                value, domain="imio.smartweb", target_language=current_lang
+            )
+        if translated_initial_values:
+            options["initialValues"] = translated_initial_values
+        return options
+
+
+@implementer(IFieldWidget)
+def TranslatedAjaxSelectFieldWidget(field, request, extra=None):
+    if extra is not None:
+        request = extra
+    return FieldWidget(field, TranslatedAjaxSelectWidget(request))

{imio.smartweb.common-1.2.15.dist-info → imio.smartweb.common-1.2.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.15
+Version: 1.2.17
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -161,6 +161,21 @@ Changelog
 =========
 
 
+1.2.17 (2024-06-06)
+-------------------
+
+- WEB-4113 : Add `TranslatedAjaxSelectFieldWidget` to fix translations of initial
+  values in select2 fields
+  [laulaz]
+
+
+1.2.16 (2024-05-30)
+-------------------
+
+- WEB-4107 : Update resource registries modification time (used as ETag) at Zope startup
+  [laulaz]
+
+
 1.2.15 (2024-05-27)
 -------------------
 

{imio.smartweb.common-1.2.15.dist-info → imio.smartweb.common-1.2.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.common-1.2.15-py3.11-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.17-py3.11-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
 imio/smartweb/common/adapters.py,sha256=rLlObjqZm3hs2hgUT-LmJytwhT-E1rTvbpIi0mmKQqY,610
 imio/smartweb/common/adapters.zcml,sha256=ndYNj0J_BFfVpX_7JhY2asSwLzXG-WmjLdfwL9hX_No,254
@@ -14,8 +14,8 @@ imio/smartweb/common/privacy.py,sha256=ePuR-c-w7AmXSWA6czpfFK-wYNdoCm5yzEUKNSFKD
 imio/smartweb/common/privacy.zcml,sha256=KHC4JJt-9MbPcHHukN7QLwpMFXj96gXb0-vzU2ZboGk,1772
 imio/smartweb/common/profiles.zcml,sha256=EJoh-_QIN8ozCsPiEnx2mBmqC0vLrL7KF69PD90b6Zg,1278
 imio/smartweb/common/setuphandlers.py,sha256=ejKHdgROXjmDM7dgoAh9sITiAJDfQGNxTEOO5JaSEaE,1053
-imio/smartweb/common/subscribers.py,sha256=GHG_PIqsNV7K-pr_cXceQx1WCXylvQiv1lCgSGNJIno,2608
-imio/smartweb/common/subscribers.zcml,sha256=WZNhGtbTux2DoWHhLCQd1uJY27VhVLsibf0bdsclHOU,860
+imio/smartweb/common/subscribers.py,sha256=pbPQJ1YrfPlYCfxLAJ5sOy_5OToAfs2egX68z2-EFRw,3490
+imio/smartweb/common/subscribers.zcml,sha256=8v2lqNNVAHlrh2G3jtjVgr3Asrw8WJLS9jSX5U6juFg,971
 imio/smartweb/common/testing.py,sha256=GKlYMHJUSxZFVX0o_R_c_Au1VYlkd-GjykQqfONHv7I,1985
 imio/smartweb/common/testing.zcml,sha256=7N-ALtklyWeLSzZmlxN2Tp-aZe_3An--w_6BGl1991E,172
 imio/smartweb/common/utils.py,sha256=jzNLR41JVehAxqqQV2WaUiYkB1V6xpMpPGE-G3JJ7Pc,7041
@@ -24,7 +24,7 @@ imio/smartweb/common/vocabularies.zcml,sha256=iFJer5q3wabBp_EZivPPVUqI1_9w5P_Ft1
 imio/smartweb/common/behaviors/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 imio/smartweb/common/behaviors/configure.zcml,sha256=RfGH8DIybHpxxe2HUsjH2QKSiWYpV7lCZhGN6KLFwCw,531
 imio/smartweb/common/behaviors/iam.py,sha256=17ON7M6FHXOM_8NOHT_QnJJuAIs4diWCrguHP6Lh5oA,825
-imio/smartweb/common/behaviors/topics.py,sha256=mguoFXN5XjcGXvA5HeV_l7-gJ5eR0hfjN1nbXYogcWw,832
+imio/smartweb/common/behaviors/topics.py,sha256=K9XkhTBxxp_nBBeQ-ovUpmOc6raXIiYqmzJtlKVdhbI,863
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=QngrsXOIjOt0xHEt2r0W66CPg5msY4H7mDkRaAEGQdg,3044
 imio/smartweb/common/browser/configure.zcml,sha256=1cDR2cy7O6WX33cFmbJU971wxg22LkLJYiMKCmBTWrA,3177
@@ -97,6 +97,7 @@ imio/smartweb/common/tests/test_utils.py,sha256=S4QrNVvkHv3Oxp45fWQ65dmGsk7POgUn
 imio/smartweb/common/tests/test_viewlets.py,sha256=NVEZWEmYo4K_-81Q6w-JTx2nT_3NBcJCl3946MAUnhU,1738
 imio/smartweb/common/tests/test_vocabularies.py,sha256=C-78USTvOHljuMSLkNb9onSRxLEJmBQLpktetAO74RE,848
 imio/smartweb/common/tests/test_vocabulary.py,sha256=4E5i5znt_hLhnnRay1iBaOZRmQyFJs8-OMdPm4iSGSg,1638
+imio/smartweb/common/tests/test_widgets.py,sha256=FQ2FphLRZQ1yuMngQ6cu4LxDaLVTAg1VyIUILV0XRUI,2009
 imio/smartweb/common/tests/resources/image.png,sha256=GBnPJt2ALEefn8GJAY1Lh8o9L6l6G77GJSyS0uveHvQ,1185
 imio/smartweb/common/tests/resources/image_1400x800.png,sha256=Iy3bWGH4NBlgYC5BolZiNYFTKmCm0_I9MZDZo4sw_V4,30604
 imio/smartweb/common/tests/resources/image_1800x700.png,sha256=aQcMisSFQO78c6QX4mO7qIfDb9SDRmfzTuPjxMJ_0HM,32643
@@ -132,10 +133,12 @@ imio/smartweb/common/viewlets/privacy.pt,sha256=bAD-I6s3LUgkh30vyTbP3pNUZQYua1Kx
 imio/smartweb/common/viewlets/privacy.py,sha256=H752etTTIFCM0wTwjESQFl0PStJfCoSRfcePSUQOp8E,449
 imio/smartweb/common/viewlets/skip_to_content.pt,sha256=FFfTxvRl8V52FzFE6In6B34ApgShNntvMp6F1qwfL0g,376
 imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFNiDv9zUGAueRyXAIXQDo,496
-imio.smartweb.common-1.2.15.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.15.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.15.dist-info/METADATA,sha256=hpPy5ZJ6R9wtfDuXI7FP-z057PBjqVekgZ-hGJX-Qcg,14848
-imio.smartweb.common-1.2.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-imio.smartweb.common-1.2.15.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.15.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.15.dist-info/RECORD,,
+imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+imio/smartweb/common/widgets/select.py,sha256=vfVdbecH7qDfJvWV6TfkpqocD6AA5G4yIq7XqSOuVNw,1142
+imio.smartweb.common-1.2.17.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.17.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.17.dist-info/METADATA,sha256=JSs5I9lmfEo-eKA4m96TnRIXC7FIYwANeUBFn9i6EdE,15154
+imio.smartweb.common-1.2.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+imio.smartweb.common-1.2.17.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.17.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.17.dist-info/RECORD,,