aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Handlers
diff options
context:
space:
mode:
authortkikuchi <>2005-02-06 01:29:32 +0000
committertkikuchi <>2005-02-06 01:29:32 +0000
commite51419d1cfe2059dbd507ddd78fe8c7131b6c538 (patch)
tree73410345bcf3b72a5f79b058efeedd47506416f0 /Mailman/Handlers
parentb8a931284d51365af2d14c1d7804cc8b7711b57f (diff)
downloadmailman2-e51419d1cfe2059dbd507ddd78fe8c7131b6c538.tar.gz
mailman2-e51419d1cfe2059dbd507ddd78fe8c7131b6c538.tar.xz
mailman2-e51419d1cfe2059dbd507ddd78fe8c7131b6c538.zip
sourceforge patch id=1107169, re-use member_moderation_notice ...
Instead of re-use, a new variable 'nonmember_rejection_notice' was introduced. For compatibility with my patch for subject numbering, 'data_version' was raised by 3. Sorry for the leap but I want MY user to get smooth update. (TK)
Diffstat (limited to 'Mailman/Handlers')
-rw-r--r--Mailman/Handlers/Moderate.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 61e6cafc..e8669c83 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -135,7 +135,11 @@ def matches_p(sender, nonmembers):
def do_reject(mlist):
listowner = mlist.GetOwnerEmail()
- raise Errors.RejectMessage, Utils.wrap(_("""\
+ if mlist.nonmember_rejection_notice:
+ raise Errors.RejectMessage, \
+ Utils.wrap(_(mlist.nonmember_rejection_notice))
+ else:
+ raise Errors.RejectMessage, Utils.wrap(_("""\
You are not allowed to post to this mailing list, and your message has been
automatically rejected. If you think that your messages are being rejected in
error, contact the mailing list owner at %(listowner)s."""))