From c16540cdbf5c7434befadecf083574acbfd5e935 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Tue, 31 Dec 2002 03:28:41 +0000
Subject: do_discard(): Make sure the internal text/plain message has the
 correct character set for the matching language.  Closes SF bug #659157.

---
 Mailman/Handlers/Moderate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 95df5465c..d44cb89b3 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -146,15 +146,17 @@ def do_discard(mlist, msg):
     sender = msg.get_sender()
     # Do we forward auto-discards to the list owners?
     if mlist.forward_auto_discards:
+        lang = mlist.preferred_language
         varhelp = '%s/?VARHELP=privacy/sender/discard_these_nonmembers' % \
                   mlist.GetScriptURL('admin', absolute=1)
         nmsg = Message.UserNotification(mlist.GetOwnerEmail(),
                                         mlist.GetBouncesEmail(),
                                         _('Auto-discard notification'),
-                                        lang=mlist.preferred_language)
+                                        lang=lang)
         nmsg.set_type('multipart/mixed')
         text = MIMEText(Utils.wrap(_(
-            'The attached message has been automatically discarded.')))
+            'The attached message has been automatically discarded.')),
+                        _charset=Utils.GetCharSet(lang))
         nmsg.attach(text)
         nmsg.attach(MIMEMessage(msg))
         nmsg.send(mlist)
-- 
cgit v1.3.1