aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2021-04-07 21:34:54 -0700
committerMark Sapiro <mark@msapiro.net>2021-04-07 21:34:54 -0700
commit5a9f8b6ae30f93bdff8f7a198f59d9ef74165faa (patch)
treeb956df2d2869a6376be8db316e852f2f4dcfc6ff
parented0adf071ced3aef5799ab9d08503142553703af (diff)
downloadmailman2-5a9f8b6ae30f93bdff8f7a198f59d9ef74165faa.tar.gz
mailman2-5a9f8b6ae30f93bdff8f7a198f59d9ef74165faa.tar.xz
mailman2-5a9f8b6ae30f93bdff8f7a198f59d9ef74165faa.zip
Translate 'disabled' when used.
-rw-r--r--Mailman/Bouncer.py4
-rw-r--r--NEWS3
2 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 5077f84c..909f58b0 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -226,12 +226,14 @@ class Bouncer:
if self.bounce_notify_owner_on_disable:
self.__sendAdminBounceNotice(member, msg)
- def __sendAdminBounceNotice(self, member, msg, did=_('disabled')):
+ def __sendAdminBounceNotice(self, member, msg, did=None):
# BAW: This is a bit kludgey, but we're not providing as much
# information in the new admin bounce notices as we used to (some of
# it was of dubious value). However, we'll provide empty, strange, or
# meaningless strings for the unused %()s fields so that the language
# translators don't have to provide new templates.
+ if did is None:
+ did = _('disabled')
siteowner = Utils.get_site_email(self.host_name)
text = Utils.maketext(
'bounce.txt',
diff --git a/NEWS b/NEWS
index e944a11d..a1cf751f 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ Here is a history of user visible changes to Mailman.
or list's language to avoid a possible UnicodeError when including the
message body in the reply. (LP: #1921682)
+ - Delivery disabled by bounce notices to admins now have 'disabled'
+ properly translated. (LP: #1922843)
+
2.1.34 (26-Jun-2020)
i18n