diff options
Diffstat (limited to '')
| -rw-r--r-- | src/mailman/pipeline/mime_delete.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/moderate.py | 10 | ||||
| -rw-r--r-- | src/mailman/pipeline/scrubber.py | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/pipeline/mime_delete.py index 515888001..39b45fa77 100644 --- a/src/mailman/pipeline/mime_delete.py +++ b/src/mailman/pipeline/mime_delete.py @@ -238,7 +238,7 @@ def dispose(mlist, msg, msgdata, why): mlist.ForwardMessage( msg, text=_("""\ -The attached message matched the %(listname)s mailing list's content filtering +The attached message matched the $listname mailing list's content filtering rules and was prevented from being forwarded on to the list membership. You are receiving the only remaining copy of the discarded message. diff --git a/src/mailman/pipeline/moderate.py b/src/mailman/pipeline/moderate.py index a2acf4714..2a59592e5 100644 --- a/src/mailman/pipeline/moderate.py +++ b/src/mailman/pipeline/moderate.py @@ -76,7 +76,7 @@ def process(mlist, msg, msgdata): # Reject text = mlist.member_moderation_notice if text: - text = Utils.wrap(text) + text = wrap(text) else: # Use the default RejectMessage notice string text = None @@ -144,12 +144,12 @@ def do_reject(mlist): listowner = mlist.GetOwnerEmail() if mlist.nonmember_rejection_notice: raise errors.RejectMessage, \ - Utils.wrap(_(mlist.nonmember_rejection_notice)) + wrap(_(mlist.nonmember_rejection_notice)) else: - raise errors.RejectMessage, Utils.wrap(_("""\ + raise errors.RejectMessage, 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.""")) +error, contact the mailing list owner at ${listowner}.""")) @@ -163,7 +163,7 @@ def do_discard(mlist, msg): _('Auto-discard notification'), lang=mlist.preferred_language) nmsg.set_type('multipart/mixed') - text = MIMEText(Utils.wrap(_( + text = MIMEText(wrap(_( 'The attached message has been automatically discarded.')), _charset=mlist.preferred_language.charset) nmsg.attach(text) diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index 1f425b54e..c9c7a3f6d 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -27,15 +27,12 @@ __all__ = [ import os import re -import sys import time -import errno import hashlib import logging import binascii from email.charset import Charset -from email.generator import Generator from email.utils import make_msgid, parsedate from lazr.config import as_boolean from locknix.lockfile import Lock |