aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Bouncer.py
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2021-10-15 05:39:36 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2021-10-15 05:39:36 +0900
commitd4a18da3a7dda34718f7043409f2dbc28a6e97c4 (patch)
tree0b6ce2aa91377c21584f836e650609d427e57ed6 /Mailman/Bouncer.py
parent393892351c22b83e54b95965d17ae346e5fad989 (diff)
parent6cc831d90d9e22091c05f49e54502d188f7f0712 (diff)
downloadmailman2-d4a18da3a7dda34718f7043409f2dbc28a6e97c4.tar.gz
mailman2-d4a18da3a7dda34718f7043409f2dbc28a6e97c4.tar.xz
mailman2-d4a18da3a7dda34718f7043409f2dbc28a6e97c4.zip
sync merge lp:mailman/2.1 up to 1871
Diffstat (limited to 'Mailman/Bouncer.py')
-rw-r--r--Mailman/Bouncer.py4
1 files changed, 3 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',