Merge branch 'main' into test-refactoring

Author: 1letter

CHANGES.rst

@@ -1,3 +1,13 @@
+5.3.1 (unreleased)
+------------------
+
+New features:
+
+
+- update the spanish translations missing @macagua (#242)
+- add more improvements about i18n support @macagua (#241)
+
+
 5.3.0 (2025-10-08)
 ------------------
 

README.rst

@@ -12,20 +12,20 @@ collective.collectionfilter
 
 Faceted navigation filter for collection or contentlisting tiles.
 
-This Plone 5 addon allows you to filter listing results for fields which are indexed in the catalog
-(Plones internal search tool).
+This Plone addon for 5.x/6.x versions, allows you to filter listing results for fields which are indexed in the catalog
+(Plone internal search tool).
 For example, you can add a subject filter, but also a filter for authors or portal types.
 
 The filter types can be extended (see: ``collective.collectionfilter.vocabularies``).
 
-There are three portlets/tiles available for filtering:
+There are five portlets/tiles available for filtering:
 
 ``Collection Filter``
     a list with values (select, radio, checkbox, link) you can filter on
 ``Collection Search``
     a SearchableText input field to do a fulltextsearch on the collection results
 ``Collection Maps``
-    a LeafletJS map which shows and filters ``IGeolocatable`` items on it
+    a `LeafletJS`_ map which shows and filters ``IGeolocatable`` items on it
     (this feature is available if ``collective.geolocationbehavior`` is installed and the behavior
     is activated on a contenttype. See installation notes below)
 ``Collection Result Listing Sort``
@@ -52,7 +52,9 @@ option will redirect you to the collection.
 Mosaic Integration
 ------------------
 
-Use the package extra to install the required dependencies::
+Use the package extra to install the required dependencies:
+
+::
 
     [buildout]
     ...
@@ -71,17 +73,18 @@ If you want to use filter tiles with a collection then add a content listing til
 It is also possible to use the ``Embed content`` tile if there is a unique selector on your collection view.
 
 
-
 Geolocation filter support
 --------------------------
 
-If ``collective.geolocationbehavior`` is installed, this package provides a LeafletJS Maps tile/portlet
+If ``collective.geolocationbehavior`` is installed, this package provides a `LeafletJS`_ Maps tile/portlet
 which shows each item of a collection result if the ``IGeolocatable`` information is available.
 In addition you can activate the ``Narrow down results`` checkbox to narrow down the collection result and
 other available filter tiles/portlets if the user moves or zooms the map.
 
 We provide a package extra to install all required dependencies with their according versions.
-Simply do this somewhere in your buildout::
+Simply do this somewhere in your buildout:
+
+::
 
     [buildout]
     ...
@@ -118,7 +121,9 @@ Within this adapter, you can modify the already populated ``_groupby`` attribute
 
 This is how.
 
-Write an adapter::
+Write an adapter:
+
+::
 
     # -*- coding: utf-8 -*-
     from collective.collectionfilter.interfaces import IGroupByCriteria
@@ -147,11 +152,13 @@ Write an adapter::
         groupby._groupby['Subject']['sort_key_function'] = subjectsort
         groupby._groupby['my_new_index'] = {
             'index': 'my_new_index',
-            'metadata': 'my_new_index_metadata_colum',
+            'metadata': 'my_new_index_metadata_column',
             'display_modifier': lambda it, idx: u'this is awesome: {0}'.format(it)
         }
 
-Register the adapter::
+Register the adapter:
+
+::
 
     <configure xmlns="http://namespaces.zope.org/zope">
       <adapter factory=".collectionfilter.groupby_modifier" name="modifier_1" />
@@ -168,12 +175,17 @@ Compatibility
 - Version 4.x is compatible with Plone 5.2+
 - Version 3.x is compatible with Plone 5.0.x and 5.1.x
 
-If your theme doesn't work well with AJAX loading this can be overridden in the registry or via diazo.
+If your theme doesn't work well with `AJAX` loading this can be overridden in the registry or via `diazo`_.
 
 Author
 ------
 
 - Johannes Raggam
 - Peter Holzer
 
-This package is based on ``collective.portlet.collectionfilter`` and ``collective.portlet.collectionbysubject``.
+This package is based on `collective.portlet.collectionfilter`_ and `collective.portlet.collectionbysubject`_.
+
+.. _LeafletJS: https://leafletjs.com/
+.. _diazo: https://docs.diazo.org/en/latest/index.html
+.. _collective.portlet.collectionfilter: https://pypi.org/project/collective.portlet.collectionfilter/
+.. _collective.portlet.collectionbysubject: https://pypi.org/project/collective.portlet.collectionbysubject/

build_i18n.sh

@@ -2,5 +2,12 @@
 I18NDUDE=i18ndude
 I18NPATH=./src/collective/collectionfilter
 DOMAIN=collective.collectionfilter
+PLONE_DOMAIN=plone
+
+# For collective.collectionfilter.pot file
 $I18NDUDE rebuild-pot --pot $I18NPATH/locales/$DOMAIN.pot --create $DOMAIN $I18NPATH
 $I18NDUDE sync --pot $I18NPATH/locales/$DOMAIN.pot $I18NPATH/locales/*/LC_MESSAGES/$DOMAIN.po
+
+# For plone.pot file
+$I18NDUDE rebuild-pot --pot $I18NPATH/locales/$PLONE_DOMAIN.pot --create $PLONE_DOMAIN $I18NPATH/portlets/profiles/portlets_with_maps/ $I18NPATH/portlets/profiles/default/
+$I18NDUDE sync --pot $I18NPATH/locales/$PLONE_DOMAIN.pot $I18NPATH/locales/*/LC_MESSAGES/$PLONE_DOMAIN.po

src/collective/collectionfilter/configure.zcml

@@ -79,18 +79,19 @@
 
   <genericsetup:registerProfile
       name="default"
-      title="collective.collectionfilter base"
-      description="Extension profile for Plone."
+      title="collective.collectionfilter: 'base' install profile"
+      description="Install 'base' profile for collective.collectionfilter addon."
       provides="Products.GenericSetup.interfaces.EXTENSION"
       directory="profiles/default"
       />
   <genericsetup:registerProfile
       name="uninstall"
-      title="collective.collectionfilter base uninstall"
-      description="Extension profile for Plone."
+      title="collective.collectionfilter: 'base' uninstall profile"
+      description="Uninstall 'base' profile for collective.collectionfilter addon."
       provides="Products.GenericSetup.interfaces.EXTENSION"
       directory="profiles/uninstall"
       />
+
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="collective.collectionfilter-hiddenprofiles"

src/collective/collectionfilter/locales/collective.collectionfilter.pot

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-10-06 10:40+0000\n"
+"POT-Creation-Date: 2025-11-17 20:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -91,9 +91,16 @@ msgstr ""
 msgid "Edit Collection Search Portlet"
 msgstr ""
 
-#: collective/collectionfilter/configure.zcml:86
+#: collective/collectionfilter/portlets/configure.zcml:86
+msgid "Install 'Portlets (with maps)' profile for collective.collectionfilter addon."
+msgstr ""
+
 #: collective/collectionfilter/portlets/configure.zcml:77
-msgid "Extension profile for Plone."
+msgid "Install 'Portlets' profile for collective.collectionfilter addon."
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:86
+msgid "Install 'base' profile for collective.collectionfilter addon."
 msgstr ""
 
 #: collective/collectionfilter/vocabularies.py:99
@@ -122,11 +129,19 @@ msgstr ""
 msgid "This portlet shows sorting options for the result listing."
 msgstr ""
 
+#: collective/collectionfilter/portlets/configure.zcml:94
+msgid "Uninstall 'Portlets' profile for collective.collectionfilter addon."
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:93
+msgid "Uninstall 'base' profile for collective.collectionfilter addon."
+msgstr ""
+
 #: collective/collectionfilter/vocabularies.py:98
 msgid "Yes"
 msgstr ""
 
-#: collective/collectionfilter/tiles/__init__.py:192
+#: collective/collectionfilter/tiles/__init__.py:188
 msgid "You will need to add a Content Listing tile or target a collection to make Filters work"
 msgstr ""
 
@@ -136,20 +151,24 @@ msgstr ""
 msgid "button_search"
 msgstr ""
 
-#: collective/collectionfilter/configure.zcml:86
-msgid "collective.collectionfilter base"
-msgstr ""
-
-#: collective/collectionfilter/configure.zcml:93
-msgid "collective.collectionfilter base uninstall"
+#: collective/collectionfilter/portlets/configure.zcml:86
+msgid "collective.collectionfilter: 'Portlets (with maps)' install profile"
 msgstr ""
 
 #: collective/collectionfilter/portlets/configure.zcml:77
-msgid "collective.collectionfilter portlets"
+msgid "collective.collectionfilter: 'Portlets' install profile"
 msgstr ""
 
 #: collective/collectionfilter/portlets/configure.zcml:94
-msgid "collective.collectionfilter portlets uninstall"
+msgid "collective.collectionfilter: 'Portlets' uninstall profile"
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:86
+msgid "collective.collectionfilter: 'base' install profile"
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:93
+msgid "collective.collectionfilter: 'base' uninstall profile"
 msgstr ""
 
 #. Default: "Default map layer"

src/collective/collectionfilter/locales/de-ch/LC_MESSAGES/collective.collectionfilter.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-10-06 10:40+0000\n"
+"POT-Creation-Date: 2025-11-17 20:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -91,9 +91,16 @@ msgstr "Kollektionssortierung bearbeiten"
 msgid "Edit Collection Search Portlet"
 msgstr "Portlet zur Suche in Kollektionen bearbeiten"
 
-#: collective/collectionfilter/configure.zcml:86
+#: collective/collectionfilter/portlets/configure.zcml:86
+msgid "Install 'Portlets (with maps)' profile for collective.collectionfilter addon."
+msgstr ""
+
 #: collective/collectionfilter/portlets/configure.zcml:77
-msgid "Extension profile for Plone."
+msgid "Install 'Portlets' profile for collective.collectionfilter addon."
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:86
+msgid "Install 'base' profile for collective.collectionfilter addon."
 msgstr ""
 
 #: collective/collectionfilter/vocabularies.py:99
@@ -122,11 +129,19 @@ msgstr "Dieses Portlet zeigt gruppierte Kollektionsergebnisse und erlaubt eine w
 msgid "This portlet shows sorting options for the result listing."
 msgstr "Dieses Portlet zeigt Sortieroptionen für die Ergebnisliste an."
 
+#: collective/collectionfilter/portlets/configure.zcml:94
+msgid "Uninstall 'Portlets' profile for collective.collectionfilter addon."
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:93
+msgid "Uninstall 'base' profile for collective.collectionfilter addon."
+msgstr ""
+
 #: collective/collectionfilter/vocabularies.py:98
 msgid "Yes"
 msgstr "Ja"
 
-#: collective/collectionfilter/tiles/__init__.py:192
+#: collective/collectionfilter/tiles/__init__.py:188
 msgid "You will need to add a Content Listing tile or target a collection to make Filters work"
 msgstr "Die Mosaic Seite benötigt ein \"Contentlisting Tile\" damit das Filterergebnis dargestellt werden kann."
 
@@ -136,20 +151,24 @@ msgstr "Die Mosaic Seite benötigt ein \"Contentlisting Tile\" damit das Filtere
 msgid "button_search"
 msgstr "suchen"
 
-#: collective/collectionfilter/configure.zcml:86
-msgid "collective.collectionfilter base"
-msgstr ""
-
-#: collective/collectionfilter/configure.zcml:93
-msgid "collective.collectionfilter base uninstall"
+#: collective/collectionfilter/portlets/configure.zcml:86
+msgid "collective.collectionfilter: 'Portlets (with maps)' install profile"
 msgstr ""
 
 #: collective/collectionfilter/portlets/configure.zcml:77
-msgid "collective.collectionfilter portlets"
+msgid "collective.collectionfilter: 'Portlets' install profile"
 msgstr ""
 
 #: collective/collectionfilter/portlets/configure.zcml:94
-msgid "collective.collectionfilter portlets uninstall"
+msgid "collective.collectionfilter: 'Portlets' uninstall profile"
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:86
+msgid "collective.collectionfilter: 'base' install profile"
+msgstr ""
+
+#: collective/collectionfilter/configure.zcml:93
+msgid "collective.collectionfilter: 'base' uninstall profile"
 msgstr ""
 
 #. Default: "Default map layer"

src/collective/collectionfilter/locales/de-ch/LC_MESSAGES/plone.po

@@ -0,0 +1,64 @@
+# --- PLEASE EDIT THE LINES BELOW CORRECTLY ---
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2025-11-17 20:09+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"Language-Code: de-ch\n"
+"Language-Name: English\n"
+"Preferred-Encodings: utf-8 latin1\n"
+"Domain: plone\n"
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "Collection Filter"
+msgstr "Kollektionsfilter"
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+msgid "Collection Filter Reset"
+msgstr "Kollektionsfilter zurücksetzen"
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "Collection Filter Result Sorting"
+msgstr "Kollektionsfilter Ergebnis-Sortierung"
+
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "Collection Maps"
+msgstr "Kollektionskartenfilter"
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "Collection Search"
+msgstr "Kollektionssuche"
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "Portlet that groups collections items by criteria."
+msgstr "Dieses Portlet gruppiert Kollektionselemente nach Kriterien."
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "This portlet allows fulltext search in collection results."
+msgstr "Dieses Portlet erlaubt eine Volltextsuche in Kollektionsergebnissen und schränkt diese weiter ein."
+
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "This portlet allows map filtering in collection results."
+msgstr "Dieses Portlet erlaubt eine Kartenfilterung in Kollektionsergebnissen."
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+msgid "This portlet allows resetting all filters"
+msgstr "Dieses Portlet erlaubt das Zurücksetzen aller Filter."
+
+#: collective/collectionfilter/portlets/profiles/default/portlets.xml
+#: collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml
+msgid "This portlet allows sorting of the filtered result listing."
+msgstr "Dieses Portlet erlaubt das Sortieren der gefilterten Ergebnisliste."