diff options
| author | msapiro <> | 2006-02-22 06:16:51 +0000 |
|---|---|---|
| committer | msapiro <> | 2006-02-22 06:16:51 +0000 |
| commit | 64ed3636d0e4d76779da92f18b8fdc12b43ad33b (patch) | |
| tree | f5fa2b6c4098fdf900f817537b425b540be3066d | |
| parent | 8b3da1f3b4b91b6f5d99f73d325dd0812371485d (diff) | |
| download | mailman2-64ed3636d0e4d76779da92f18b8fdc12b43ad33b.tar.gz mailman2-64ed3636d0e4d76779da92f18b8fdc12b43ad33b.tar.xz mailman2-64ed3636d0e4d76779da92f18b8fdc12b43ad33b.zip | |
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.)
| -rw-r--r-- | Mailman/MailList.py | 8 |
1 files 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') |