Merge branch 'main' into sorting_problems_scadenziario

.github/workflows/flake8.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/pyroma.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

.github/workflows/tests.yml

@@ -15,19 +15,19 @@ jobs:
         # [Python version, tox env]
         # - ["2.7",  "py27-plone52"]
         # - ["3.7",  "py37-plone52"]
-        - ["3.8",  "py38-plone60"]
+        # - ["3.8",  "py38-plone60"]
         - ["3.9",  "py39-plone60"]
         - ["3.10",  "py310-plone60"]
         - ["3.11",  "py311-plone60"]
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/pip

.github/workflows/zpretty.yml

@@ -6,20 +6,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

CHANGES.rst

@@ -1,12 +1,22 @@
 Changelog
 =========
 
-6.3.1 (unreleased)
+6.3.2 (unreleased)
 ------------------
 
+- Added the metadata preview_caption and image_caption. An upgrade step is not necessary because the metadata will primarily be used for new content.
+  [mamico]
+- add SEO behavior to File
+  [mamico]
 - Fix sorting in @scadenziario-day endpoint.
   [folix-01]
 
+6.3.1 (2024-12-12)
+------------------
+
+- Update it translations
+  [lucabel]
+
 
 6.3.0 (2024-12-05)
 ------------------

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="design.plone.contenttypes",
-    version="6.3.1.dev0",
+    version="6.3.2.dev0",
     description="DesignItalia contenty types",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/design/plone/contenttypes/controlpanels/settings.py

@@ -47,12 +47,12 @@ class IDesignPloneSettings(Interface):
     lead_image_dimension = List(
         title=_(
             "lead_image_dimension_label",
-            default="Dimensioni lead image",
+            default="Dimensioni dell'immagine di testata",
         ),
         description=_(
             "lead_image_dimension_help",
-            default="Se un content-type deve avere una dimensione della "
-            "leadimage particolare, indicarle qui. "
+            default="Se un tipo di contenuto deve avere una dimensione dell'"
+            "immagine di testata particolare, indicarle qui. "
             "Inserire le dimensioni nella forma di esempio "
             "PortalType|900x900",
         ),

src/design/plone/contenttypes/locales/design.plone.contenttypes.pot

@@ -1763,12 +1763,12 @@ msgstr ""
 msgid "interval_type_label"
 msgstr ""
 
-#. Default: "Se un content-type deve avere una dimensione della leadimage particolare, indicarle qui. Inserire le dimensioni nella forma di esempio PortalType|900x900"
+#. Default: "Se un tipo di contenuto deve avere una dimensione dell'immagine di testata particolare, indicarle qui. Inserire le dimensioni nella forma di esempio PortalType|900x900"
 #: design/plone/contenttypes/controlpanels/settings.py:52
 msgid "lead_image_dimension_help"
 msgstr ""
 
-#. Default: "Dimensioni lead image"
+#. Default: "Dimensioni dell'immagine di testata"
 #: design/plone/contenttypes/controlpanels/settings.py:48
 msgid "lead_image_dimension_label"
 msgstr ""

src/design/plone/contenttypes/locales/it/LC_MESSAGES/design.plone.contenttypes.po

@@ -402,7 +402,7 @@ msgstr ""
 #: design/plone/contenttypes/controlpanels/settings.py:106
 #: design/plone/contenttypes/profiles/default/controlpanel.xml
 msgid "Impostazioni Design Plone"
-msgstr ""
+msgstr "io-Comune"
 
 #: design/plone/contenttypes/vocabularies/tags_vocabulary.py:44
 msgid "Imposte"
@@ -1762,12 +1762,12 @@ msgstr ""
 msgid "interval_type_label"
 msgstr ""
 
-#. Default: "Se un content-type deve avere una dimensione della leadimage particolare, indicarle qui. Inserire le dimensioni nella forma di esempio PortalType|900x900"
+#. Default: "Se un tipo di contenuto deve avere una dimensione dell'immagine di testata particolare, indicarle qui. Inserire le dimensioni nella forma di esempio PortalType|900x900"
 #: design/plone/contenttypes/controlpanels/settings.py:52
 msgid "lead_image_dimension_help"
 msgstr ""
 
-#. Default: "Dimensioni lead image"
+#. Default: "Dimensioni dell'immagine di testata"
 #: design/plone/contenttypes/controlpanels/settings.py:48
 msgid "lead_image_dimension_label"
 msgstr ""

src/design/plone/contenttypes/profiles/default/catalog.xml

@@ -75,6 +75,8 @@
   <column value="icona" />
   <column value="update_note" />
   <column value="rassegna" />
+  <column value="image_caption" />
+  <column value="preview_caption" />
 
   <!-- cleanup -->
   <index name="argomenti_correlati"

src/design/plone/contenttypes/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>7309</version>
+  <version>7310</version>
   <dependencies>
     <dependency>profile-redturtle.bandi:default</dependency>
     <dependency>profile-collective.venue:default</dependency>

src/design/plone/contenttypes/profiles/default/types/File.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="File"
+        i18n:domain="plone"
+>
+  <property name="behaviors" purge="False">
+    <element value="kitconcept.seo" />
+  </property>
+</object>

src/design/plone/contenttypes/upgrades/configure.zcml

@@ -920,5 +920,11 @@
       destination="7309"
       handler=".to_730x.to_7309"
       />
-
+  <genericsetup:upgradeStep
+      title="add kitconcept.seo to File"
+      profile="design.plone.contenttypes:default"
+      source="7309"
+      destination="7310"
+      handler=".to_730x.to_7310"
+      />
 </configure>

src/design/plone/contenttypes/upgrades/to_730x.py

@@ -170,3 +170,16 @@ def to_7309(context):
     ps.unsetLastVersionForProfile("eea.api.taxonomy:default")
     logger.info("Install blocksfield")
     installOrReinstallProduct(api.portal.get(), "collective.volto.blocksfield")
+
+
+def to_7310(context):
+    logger.info("Enable kitconcept.seo behavior to File")
+    portal_types = api.portal.get_tool(name="portal_types")
+    behavior = "kitconcept.seo"
+    for ct in ["File"]:
+        portal_type = portal_types.get(ct, None)
+        if portal_type:
+            behaviors = list(portal_type.behaviors)
+            if behavior not in behaviors:
+                behaviors.append(behavior)
+                portal_type.behaviors = tuple(behaviors)

test-6.0.x.cfg

@@ -7,4 +7,4 @@ extends =
 
 [versions]
 collective.volto.blocksfield = 2.2.0
-collective.taxonomy = 3.1.5
+collective.taxonomy = 3.1.5