From 64ed3636d0e4d76779da92f18b8fdc12b43ad33b Mon Sep 17 00:00:00 2001
From: msapiro <>
Date: Wed, 22 Feb 2006 06:16:51 +0000
Subject: Fixed bug 1435722 by encoding the i18n subject in the character set
of the translation rather that that of the list language. (The subscribers
language may be different.)
---
Mailman/MailList.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index a8484e41..aa1da4b7 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 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
@@ -210,7 +210,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
def GetConfirmJoinSubject(self, listname, cookie):
if mm_cfg.VERP_CONFIRMATIONS and cookie:
- cset = Utils.GetCharSet(self.preferred_language)
+ cset = i18n.get_translation().charset() or \
+ Utils.GetCharSet(self.preferred_language)
subj = Header(
_('Your confirmation is required to join the %(listname)s mailing list'),
cset, header_name='subject')
@@ -220,7 +221,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
def GetConfirmLeaveSubject(self, listname, cookie):
if mm_cfg.VERP_CONFIRMATIONS and cookie:
- cset = Utils.GetCharSet(self.preferred_language)
+ cset = i18n.get_translation().charset() or \
+ Utils.GetCharSet(self.preferred_language)
subj = Header(
_('Your confirmation is required to leave the %(listname)s mailing list'),
cset, header_name='subject')
--
cgit v1.2.3