Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11416
Modified Files:
Tag: Release_2_1-maint
MailList.py
Log Message:
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.)
Index: MailList.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailList.py,v
retrieving revision 2.100.2.30
retrieving revision 2.100.2.31
diff -u -d -r2.100.2.30 -r2.100.2.31
--- MailList.py 30 Dec 2005 18:50:07 -0000 2.100.2.30
+++ MailList.py 22 Feb 2006 06:16:51 -0000 2.100.2.31
@@ -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 @@
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 @@
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')
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
