Include recylebin specific deletion success messages

src/plone/app/content/browser/actions.py

@@ -2,10 +2,13 @@
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from OFS.CopySupport import CopyError
+from plone.app.content.utils import get_recycle_bin_message
 from plone.base import PloneMessageFactory as _
+from plone.base.interfaces.recyclebin import IRecycleBin
 from plone.base.utils import get_user_friendly_types
 from plone.base.utils import safe_text
 from plone.locking.interfaces import ILockable
+from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
@@ -19,6 +22,7 @@
 from zope import schema
 from zope.component import getMultiAdapter
 from zope.component import queryMultiAdapter
+from zope.component import queryUtility
 from zope.container.interfaces import INameChooser
 from zope.event import notify
 from zope.interface import Interface
@@ -85,9 +89,24 @@ def handle_delete(self, action):
                     # unlock object as it is locked by current user
                     ILockable(self.context).unlock()
             parent.manage_delObjects(self.context.getId())
-            IStatusMessage(self.request).add(
-                _("${title} has been deleted.", mapping={"title": title})
-            )
+
+            # Check if recycle bin is enabled and show appropriate message
+            recycle_bin = queryUtility(IRecycleBin)
+            recycling_enabled = recycle_bin.is_enabled() if recycle_bin else False
+
+            if recycling_enabled:
+                # Get retention period from registry
+                registry = queryUtility(IRegistry)
+                retention_period = registry["recyclebin-controlpanel.retention_period"]
+
+                message = get_recycle_bin_message(
+                    title=title, retention_period=retention_period
+                )
+                IStatusMessage(self.request).add(message)
+            else:
+                IStatusMessage(self.request).add(
+                    _("${title} has been deleted.", mapping={"title": title})
+                )
         else:
             IStatusMessage(self.request).add(
                 _('"${title}" has already been deleted', mapping={"title": title})

src/plone/app/content/browser/contents/delete.py

@@ -2,11 +2,15 @@
 from AccessControl.Permissions import delete_objects
 from plone.app.content.browser.contents import ContentsBaseAction
 from plone.app.content.interfaces import IStructureAction
+from plone.app.content.utils import get_recycle_bin_message
 from plone.base import PloneMessageFactory as _
+from plone.base.interfaces.recyclebin import IRecycleBin
 from plone.locking.interfaces import ILockable
+from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.component import getMultiAdapter
+from zope.component import queryUtility
 from zope.component.hooks import getSite
 from zope.i18n import translate
 from zope.interface import implementer
@@ -43,9 +47,24 @@ def get_options(self):
 
 class DeleteActionView(ContentsBaseAction):
     required_obj_permission = delete_objects
-    success_msg = _("Successfully delete items")
     failure_msg = _("Failed to delete items")
 
+    @property
+    def success_msg(self):
+        """Dynamic success message that includes recycle bin information."""
+        # Check if recycle bin is enabled
+        recycle_bin = queryUtility(IRecycleBin)
+        recycling_enabled = recycle_bin.is_enabled() if recycle_bin else False
+
+        if not recycling_enabled:
+            return _("Successfully deleted items")
+
+        # Get retention period from registry
+        registry = queryUtility(IRegistry)
+        retention_period = registry["recyclebin-controlpanel.retention_period"]
+
+        return get_recycle_bin_message(retention_period=retention_period)
+
     def __call__(self):
         if self.request.form.get("render") == "yes":
             confirm_view = getMultiAdapter(

src/plone/app/content/utils.py

@@ -40,3 +40,40 @@ def json_dumps(data):
 
 # can eventually provide custom handling here if we want
 json_loads = simplejson.loads
+
+
+def get_recycle_bin_message(title=None, retention_period=0):
+    """Generate appropriate message for recycled items based on retention period.
+
+    Args:
+        title: The title of the deleted item (optional, for single item messages)
+        retention_period: Number of days to retain items (0 = indefinite)
+
+    Returns:
+        Translated message string
+    """
+    from plone.base import PloneMessageFactory as _
+
+    if title:
+        # Single item message
+        if retention_period == 0:
+            return _(
+                "${title} has been moved to the recycle bin. It can be restored by administrators.",
+                mapping={"title": title},
+            )
+        else:
+            return _(
+                "${title} has been moved to the recycle bin. It can be restored by administrators and will be permanently deleted after ${days} days.",
+                mapping={"title": title, "days": retention_period},
+            )
+    else:
+        # Multiple items message
+        if retention_period == 0:
+            return _(
+                "Successfully moved items to recycle bin. Items can be restored by administrators."
+            )
+        else:
+            return _(
+                "Successfully moved items to recycle bin. Items can be restored by administrators and will be permanently deleted after ${days} days.",
+                mapping={"days": retention_period},
+            )