summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2002-01-06 06:27:41 +0000
committerbwarsaw2002-01-06 06:27:41 +0000
commit2e15cd7942e96b99dd66b484efa6e12d92f78c9a (patch)
tree0297e09c0308da81e5f36dfada5882a485011f9b
parente50e0c21280d57686a5a83e404df284c1132123b (diff)
downloadmailman-2e15cd7942e96b99dd66b484efa6e12d92f78c9a.tar.gz
mailman-2e15cd7942e96b99dd66b484efa6e12d92f78c9a.tar.zst
mailman-2e15cd7942e96b99dd66b484efa6e12d92f78c9a.zip
-rw-r--r--Mailman/Handlers/Hold.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py
index 6c78ed8d6..0f9b2caff 100644
--- a/Mailman/Handlers/Hold.py
+++ b/Mailman/Handlers/Hold.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001 by the Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -231,6 +231,7 @@ def hold_for_approval(mlist, msg, msgdata, exc):
i18n.set_language(mlist.preferred_language)
try:
lang = mlist.preferred_language
+ charset = Utils.GetCharSet(lang)
# We need to regenerate or re-translate a few values in d
usersubject = msg.get('subject', _('(no subject)'))
d['reason'] = _(reason)
@@ -238,11 +239,12 @@ def hold_for_approval(mlist, msg, msgdata, exc):
# craft the admin notification message and deliver it
subject = _('%(listname)s post from %(sender)s requires approval')
nmsg = Message.UserNotification(owneraddr, owneraddr, subject)
- nmsg['Content-Type'] = 'multipart/mixed'
+ nmsg.add_header('Content-Type', 'multipart/mixed',
+ charset=charset)
nmsg['MIME-Version'] = '1.0'
text = MIMEText(
Utils.maketext('postauth.txt', d, raw=1, mlist=mlist),
- _charset=Utils.GetCharSet(lang))
+ _charset=charset)
dmsg = MIMEText(Utils.wrap(_("""\
If you reply to this message, keeping the Subject: header intact, Mailman will
discard the held message. Do this if the message is spam. If you reply to