diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-01-12 21:44:15 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-01-12 21:44:15 +0900 |
| commit | 16572087609fc9c9b9f55c26c9c55985fbcad804 (patch) | |
| tree | d0af2f969c000db00909f66f9501634c43c8df26 /Mailman/Handlers | |
| parent | adb3d9035314760b62d92bda4a41991b7420360f (diff) | |
| parent | c4a7c961798353841a75c862a6fe9e22529db45d (diff) | |
| download | mailman2-16572087609fc9c9b9f55c26c9c55985fbcad804.tar.gz mailman2-16572087609fc9c9b9f55c26c9c55985fbcad804.tar.xz mailman2-16572087609fc9c9b9f55c26c9c55985fbcad804.zip | |
sync with lp:mailman/2.1 Rev 1734
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/SpamDetect.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index 257cdb24..4e554d70 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -56,7 +56,12 @@ class SpamDetected(Errors.DiscardMessage): """The message contains known spam""" class HeaderMatchHold(Errors.HoldMessage): - reason = _('The message headers matched a filter rule') + def __init__(self, pattern): + self.__pattern = pattern + + def reason_notice(self): + pattern = self.__pattern + return _('Header matched regexp: %(pattern)s') # And reset the translator @@ -195,6 +200,7 @@ error, contact the mailing list owner at %(listowner)s.""")) # pass it here but list-owner can set this to be # discarded on the GUI if he wants. return - hold_for_approval(mlist, msg, msgdata, HeaderMatchHold) + hold_for_approval( + mlist, msg, msgdata, HeaderMatchHold(pattern)) if action == mm_cfg.ACCEPT: return |