summaryrefslogtreecommitdiff
path: root/Mailman/Bouncer.py
diff options
context:
space:
mode:
authorbwarsaw2002-08-02 19:26:18 +0000
committerbwarsaw2002-08-02 19:26:18 +0000
commit1c334849852b9f739bcb17b017de3affc7b6be81 (patch)
tree6a8fcf8674e3b2d828e93121b37ab1fc5dcdccc5 /Mailman/Bouncer.py
parentefd47dafa2595b2d7f31499fe09fb52afc18734b (diff)
downloadmailman-1c334849852b9f739bcb17b017de3affc7b6be81.tar.gz
mailman-1c334849852b9f739bcb17b017de3affc7b6be81.tar.zst
mailman-1c334849852b9f739bcb17b017de3affc7b6be81.zip
Diffstat (limited to 'Mailman/Bouncer.py')
-rw-r--r--Mailman/Bouncer.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index b2ec24b39..90ff6cec6 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -225,11 +225,17 @@ class Bouncer:
optionsurl = self.GetOptionsURL(member, absolute=1)
reqaddr = self.GetRequestEmail()
lang = self.getMemberLanguage(member)
- reason = REASONS.get(reason)
- if reason is None:
- reason = _('for unknown reasons')
+ txtreason = REASONS.get(reason)
+ if txtreason is None:
+ txtreason = _('for unknown reasons')
else:
- reason = _(reason)
+ txtreason = _(txtreason)
+ # Give a little bit more detail on bounce disables
+ if reason == MemberAdaptor.BYBOUNCE:
+ date = time.strftime('%d-%b-%Y',
+ time.localtime(Utils.midnight(info.date)))
+ extra = _(' The last bounce received from you was dated %(date)s')
+ txtreason += extra
text = Utils.maketext(
'disabled.txt',
{'listname' : self.real_name,
@@ -238,7 +244,7 @@ class Bouncer:
'optionsurl' : optionsurl,
'password' : self.getMemberPassword(member),
'owneraddr' : self.GetOwnerEmail(),
- 'reason' : reason,
+ 'reason' : txtreason,
}, lang=lang, mlist=self)
msg = Message.UserNotification(member, reqaddr, text=text, lang=lang)
# BAW: See the comment in MailList.py ChangeMemberAddress() for why we