diff --git a/last_commit.txt b/last_commit.txt index 7eef30760d..bf188b946b 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -2,47 +2,31 @@ Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-16T14:58:59-08:00 +Date: 2024-12-17T08:43:13-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/b82770bb7bfa74897aa0c9a51fea78de88e7b7a3 +Commit: https://github.com/plone/plone.volto/commit/376ee868d42b41401d3455ff3484a5ae5a770df2 -allow choosing preview images from a different language tree +Preparing release 5.0.1 Files changed: -M src/plone/volto/behaviors/preview_link.py +M CHANGES.md +M setup.py +D news/172.bugfix -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' +b'diff --git a/CHANGES.md b/CHANGES.md\nindex 205444b..20619e1 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,13 @@\n \n \n \n+## 5.0.1 (2024-12-17)\n+\n+\n+### Bug fixes:\n+\n+- Allow setting `preview_image_link` to an image from a different language root folder. @davisagli #172\n+\n ## 5.0.0 (2024-12-12)\n \n \ndiff --git a/news/172.bugfix b/news/172.bugfix\ndeleted file mode 100644\nindex c4d213e..0000000\n--- a/news/172.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\ndiff --git a/setup.py b/setup.py\nindex d320b44..1863bcc 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -13,7 +13,7 @@\n \n setup(\n name="plone.volto",\n- version="5.0.1.dev0",\n+ version="5.0.1",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n long_description_content_type="text/markdown",\n' Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-16T14:59:51-08:00 +Date: 2024-12-17T08:43:40-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/6bf3d2195093789843f2424236e061dba757bd10 +Commit: https://github.com/plone/plone.volto/commit/612a8b78c09f4b05c648bc1a59e2433699c23561 -changelog +Back to development: 5.0.2 Files changed: -A news/172.bugfix +M setup.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\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' +b'diff --git a/setup.py b/setup.py\nindex 1863bcc..c1f1b10 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -13,7 +13,7 @@\n \n setup(\n name="plone.volto",\n- version="5.0.1",\n+ version="5.0.2.dev0",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n long_description_content_type="text/markdown",\n'