From d969ce53c96f3f80932114e86a91ceac8ecc77b9 Mon Sep 17 00:00:00 2001 From: sneridagh Date: Tue, 17 Dec 2024 14:48:16 +0100 Subject: [PATCH] [fc] Repository: plone.volto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Branch: refs/heads/main Date: 2024-12-16T14:58:59-08:00 Author: David Glick (davisagli) Commit: https://github.com/plone/plone.volto/commit/b82770bb7bfa74897aa0c9a51fea78de88e7b7a3 allow choosing preview images from a different language tree Files changed: M src/plone/volto/behaviors/preview_link.py Repository: plone.volto Branch: refs/heads/main Date: 2024-12-16T14:59:51-08:00 Author: David Glick (davisagli) Commit: https://github.com/plone/plone.volto/commit/6bf3d2195093789843f2424236e061dba757bd10 changelog Files changed: A news/172.bugfix Repository: plone.volto Branch: refs/heads/main Date: 2024-12-17T14:48:16+01:00 Author: Víctor Fernández de Alba (sneridagh) Commit: https://github.com/plone/plone.volto/commit/0b34cb2661968784531cf0d1f50d461f57999a44 Merge pull request #173 from plone/172-preview-image-anywhere allow choosing preview images from a different language tree Files changed: A news/172.bugfix M src/plone/volto/behaviors/preview_link.py --- last_commit.txt | 53 +++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 2d10cf783a..7eef30760d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,33 +1,48 @@ -Repository: plonetheme.barceloneta +Repository: plone.volto -Branch: refs/heads/master -Date: 2024-12-17T14:45:11+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plonetheme.barceloneta/commit/095c2aa4236cb5cd5619e4a52b10d604ba80907f +Branch: refs/heads/main +Date: 2024-12-16T14:58:59-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.volto/commit/b82770bb7bfa74897aa0c9a51fea78de88e7b7a3 -Preparing release 3.2.1 +allow choosing preview images from a different language tree Files changed: -M CHANGES.md -M setup.py -D news/384.bugfix -D news/384.internal +M src/plone/volto/behaviors/preview_link.py -b'diff --git a/CHANGES.md b/CHANGES.md\nindex e5951b5e..8cc709ef 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,20 @@\n \n \n \n+## 3.2.1 (2024-12-17)\n+\n+\n+### Bug fixes:\n+\n+- Upgrade TinyMCE 7.6.0\n+ [petschki] #384\n+\n+\n+### Internal:\n+\n+- Upgrade development dependencies.\n+ [petschki] #384\n+\n ## 3.2.0 (2024-10-30)\n \n \ndiff --git a/news/384.bugfix b/news/384.bugfix\ndeleted file mode 100644\nindex b9854ce3..00000000\n--- a/news/384.bugfix\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Upgrade TinyMCE 7.6.0\n-[petschki]\ndiff --git a/news/384.internal b/news/384.internal\ndeleted file mode 100644\nindex e3fd4387..00000000\n--- a/news/384.internal\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Upgrade development dependencies.\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex a0bb871b..b5e6ea1c 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.2.1.dev0"\n+version = "3.2.1"\n \n long_description = f"{Path(\'README.md\').read_text()}\\n{Path(\'CHANGES.md\').read_text()}"\n \n' +b'diff --git a/src/plone/volto/behaviors/preview_link.py b/src/plone/volto/behaviors/preview_link.py\nindex 4f40e05..060d03f 100644\n--- a/src/plone/volto/behaviors/preview_link.py\n+++ b/src/plone/volto/behaviors/preview_link.py\n@@ -16,6 +16,16 @@\n from zope.schema import TextLine\n \n \n+# Allow choosing preview images from a different language tree in a multi-lingual site.\n+# See https://github.com/plone/plone.volto/issues/172\n+try:\n+ import plone.app.multilingual # noqa\n+\n+ VOCAB = "plone.app.multilingual.RootCatalog"\n+except ImportError:\n+ VOCAB = "plone.app.vocabularies.Catalog"\n+\n+\n @provider(IFormFieldProvider)\n class IPreviewLink(model.Schema):\n \n@@ -25,7 +35,7 @@ class IPreviewLink(model.Schema):\n "help_previewimage",\n default="Select an image that will be used in listing and teaser blocks.",\n ),\n- vocabulary="plone.app.vocabularies.Catalog",\n+ vocabulary=VOCAB,\n required=False,\n )\n \n' -Repository: plonetheme.barceloneta +Repository: plone.volto -Branch: refs/heads/master -Date: 2024-12-17T14:45:43+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plonetheme.barceloneta/commit/7769b99a5b5e1bab7e8ba6ef6b1a8845529e28e8 +Branch: refs/heads/main +Date: 2024-12-16T14:59:51-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.volto/commit/6bf3d2195093789843f2424236e061dba757bd10 -Back to development: 3.2.2 +changelog Files changed: -M setup.py +A news/172.bugfix -b'diff --git a/setup.py b/setup.py\nindex b5e6ea1c..b9d47ec8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.2.1"\n+version = "3.2.2.dev0"\n \n long_description = f"{Path(\'README.md\').read_text()}\\n{Path(\'CHANGES.md\').read_text()}"\n \n' +b'diff --git a/news/172.bugfix b/news/172.bugfix\nnew file mode 100644\nindex 0000000..c4d213e\n--- /dev/null\n+++ b/news/172.bugfix\n@@ -0,0 +1 @@\n+Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\n' + +Repository: plone.volto + + +Branch: refs/heads/main +Date: 2024-12-17T14:48:16+01:00 +Author: Víctor Fernández de Alba (sneridagh) +Commit: https://github.com/plone/plone.volto/commit/0b34cb2661968784531cf0d1f50d461f57999a44 + +Merge pull request #173 from plone/172-preview-image-anywhere + +allow choosing preview images from a different language tree + +Files changed: +A news/172.bugfix +M src/plone/volto/behaviors/preview_link.py + +b'diff --git a/news/172.bugfix b/news/172.bugfix\nnew file mode 100644\nindex 0000000..c4d213e\n--- /dev/null\n+++ b/news/172.bugfix\n@@ -0,0 +1 @@\n+Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\ndiff --git a/src/plone/volto/behaviors/preview_link.py b/src/plone/volto/behaviors/preview_link.py\nindex 4f40e05..060d03f 100644\n--- a/src/plone/volto/behaviors/preview_link.py\n+++ b/src/plone/volto/behaviors/preview_link.py\n@@ -16,6 +16,16 @@\n from zope.schema import TextLine\n \n \n+# Allow choosing preview images from a different language tree in a multi-lingual site.\n+# See https://github.com/plone/plone.volto/issues/172\n+try:\n+ import plone.app.multilingual # noqa\n+\n+ VOCAB = "plone.app.multilingual.RootCatalog"\n+except ImportError:\n+ VOCAB = "plone.app.vocabularies.Catalog"\n+\n+\n @provider(IFormFieldProvider)\n class IPreviewLink(model.Schema):\n \n@@ -25,7 +35,7 @@ class IPreviewLink(model.Schema):\n "help_previewimage",\n default="Select an image that will be used in listing and teaser blocks.",\n ),\n- vocabulary="plone.app.vocabularies.Catalog",\n+ vocabulary=VOCAB,\n required=False,\n )\n \n'