From b3a4ce3695a952f83488b89adb4dd19fa428efb7 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 23 Jun 2026 22:11:04 +0100 Subject: [PATCH 1/2] Refs #35514 -- Added migration guide link to `AdminEmailHandler` deprecation note. --- docs/releases/6.1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/releases/6.1.txt b/docs/releases/6.1.txt index 523ef542c11a..04a7f1f245bc 100644 --- a/docs/releases/6.1.txt +++ b/docs/releases/6.1.txt @@ -681,6 +681,7 @@ Miscellaneous * The ``email_backend`` argument of :class:`.log.AdminEmailHandler` is deprecated in favor of the newly introduced ``using`` argument. + See :ref:`migrating-to-mailers-adminemailhandler` for details. * The ``BitAnd``, ``BitOr``, and ``BitXor`` classes in ``django.contrib.postgres.aggregates`` are deprecated in favor of the From 8013cf61c6a1aff9839af2953c5bdda804efdff4 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Wed, 24 Jun 2026 13:55:29 -0400 Subject: [PATCH 2/2] Refs #36984 -- Preserved translator comment on separator string. The inclusion of the comment in the .po file only works if the comment line is directly above. --- django/contrib/admin/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b593da0b8a73..31d9d567bc56 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -2798,9 +2798,9 @@ def hand_clean_DELETE(self): len(collector.protected) - delete_confirmation_max_display ) if remaining_object_count > 0: - # Translators: This string is used as a separator - # between list elements related = ( + # Translators: This string is used as a + # separator between list elements. _(", ").join(str(i) for i in objs) + _(", ") + ngettext(