Merge branch 'master' into erral-issue-3879-master

plone · Dec 7, 2023 · e05fdb4 · e05fdb4
2 parents f120f36 + 70e7760
commit e05fdb4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Products/CMFPlone/browser/syndication/adapters.py b/Products/CMFPlone/browser/syndication/adapters.py
@@ -1,6 +1,6 @@
 from DateTime import DateTime
 from OFS.interfaces import IItem
-from plone.app.contenttypes.behaviors.leadimage import ILeadImage
+from plone.app.contenttypes.behaviors.leadimage import ILeadImageBehavior
 from plone.base.interfaces.syndication import IFeed
 from plone.base.interfaces.syndication import IFeedItem
 from plone.base.interfaces.syndication import IFeedSettings
@@ -271,7 +271,7 @@ class DexterityItem(BaseItem):
     def __init__(self, context, feed):
         super().__init__(context, feed)
         self.dexterity = IDexterityContent.providedBy(context)
-        lead = ILeadImage(self.context, None)
+        lead = ILeadImageBehavior(self.context, None)
         if lead:
             if (
                 lead.image

diff --git a/Products/CMFPlone/browser/templates/plone-overview.pt b/Products/CMFPlone/browser/templates/plone-overview.pt
@@ -92,7 +92,7 @@
                     i18n:translate=""
                     tal:condition="view/has_volto"
                     href="${action}?site_id=Plone${site_number}&amp;classic=1"
-                    >Create Classic Plone site</a>
+                    >Create Classic UI Plone site</a>
                 <a class="btn btn-secondary"
                     i18n:translate=""
                     href="${action}?site_id=Plone${site_number}&amp;advanced=1"
@@ -106,7 +106,7 @@
                 an additional frontend service to use this setup.
             </p>
             <p i18n:translate="help_create_plone_site_buttons_2">
-                The 'Create Classic Plone site' button creates a Plone site configured
+                The 'Create Classic UI Plone site' button creates a Plone site configured
                 for HTML based output, as was already supported by previous Plone versions.
                 Please consult our
                 <a href="https://6.docs.plone.org/" title="Plone 6 developer documentation"

diff --git a/news/3873.bugfix b/news/3873.bugfix
@@ -0,0 +1 @@
+Corrected the name in a button and help text to "Classic UI" when creating a Plone site. @1letter
diff --git a/news/3875.bugfix b/news/3875.bugfix
@@ -0,0 +1,2 @@
+Correct the behavior interface for lead image in the syndication adapter.
+[thet]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Corrected the name in a button and help text to "Classic UI" when creating a Plone site. @1letter
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Correct the behavior interface for lead image in the syndication adapter.
		[thet]