summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2002-02-11 20:58:55 +0000
committerbwarsaw2002-02-11 20:58:55 +0000
commitfc4073abb76aad1de0f4e6acba26bd5ae5d4d002 (patch)
treee6206797fa4bef702151725aeeb1c5029226b2a8
parentf2881d14d54cd7207fde431bd276f66d19960896 (diff)
downloadmailman-fc4073abb76aad1de0f4e6acba26bd5ae5d4d002.tar.gz
mailman-fc4073abb76aad1de0f4e6acba26bd5ae5d4d002.tar.zst
mailman-fc4073abb76aad1de0f4e6acba26bd5ae5d4d002.zip
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.
-rw-r--r--Mailman/MailList.py9
1 files 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