From fc4073abb76aad1de0f4e6acba26bd5ae5d4d002 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Mon, 11 Feb 2002 20:58:55 +0000
Subject: AddMember(), ApprovedAddMember(), ApprovedDeleteMember(): When
 creating the UserNotification message object, pass in the language that the
 message should be in.  This allows us to get the character set and header
 encodings right.

Patch by Ben Gertzfield.
---
 Mailman/MailList.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 9082fe143..a5cb36bd5 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -702,11 +702,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             msg = Message.UserNotification(
                 recipient, self.GetRequestEmail(),
                 'confirm %s' % cookie,
-                text)
+                text, lang)
             msg['Reply-To'] = self.GetRequestEmail()
-            msg['MIME-Version'] = '1.0'
-            msg.add_header('Content-Type', 'text/plain',
-                           charset=Utils.GetCharSet(lang))
             msg.send(self)
             if recipient <> email:
                 who = "%s (%s)" % (email, recipient.split('@')[0])
@@ -787,7 +784,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                  }, lang=lang, mlist=self)
             msg = Message.UserNotification(
                 self.owner, Utils.get_site_email(self.host_name, 'admin'),
-                subject, text)
+                subject, text, lang)
             msg.send(self)
 
     def DeleteMember(self, name, whence=None, admin_notif=0, userack=1):
@@ -825,7 +822,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                  }, mlist=self)
             msg = Message.UserNotification(
                 self.owner, Utils.get_site_email(self.host_name, 'admin'),
-                subject, text)
+                subject, text, self.preferred_language)
             msg.send(self)
         if whence:
             whence = "; %s" % whence
-- 
cgit v1.2.3-70-g09d2