diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Cgi/admin.py | 2 | ||||
| -rw-r--r-- | Mailman/Cgi/listinfo.py | 2 | ||||
| -rw-r--r-- | Mailman/HTMLFormatter.py | 7 | ||||
| -rw-r--r-- | Mailman/MailList.py | 21 | ||||
| -rw-r--r-- | NEWS | 4 |
5 files changed, 33 insertions, 3 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index f77b358e..a92ab378 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -295,7 +295,7 @@ def admin_overview(msg=''): else: advertised.append((mlist.GetScriptURL('admin'), mlist.real_name, - mlist.description)) + Utils.websafe(mlist.GetDescription()))) # Greeting depends on whether there was an error or not if msg: greeting = FontAttr(msg, color="ff5060", size="+1") diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py index b55c263d..f1b455da 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -114,7 +114,7 @@ def listinfo_overview(msg=''): else: advertised.append((mlist.GetScriptURL('listinfo'), mlist.real_name, - Utils.websafe(mlist.description))) + Utils.websafe(mlist.GetDescription()))) if msg: greeting = FontAttr(msg, color="ff5060", size="+1") else: diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index 93686899..098a2881 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -389,11 +389,16 @@ class HTMLFormatter: listlangs = _(Utils.GetLanguageDescr(self.preferred_language)) else: listlangs = self.GetLangSelectBox(lang).Format() + if lang: + cset = Utils.GetCharSet(lang) or 'us-ascii' + else: + cset = Utils.GetCharSet(self.preferred_language) or 'us-ascii' d = { '<mm-mailman-footer>' : self.GetMailmanFooter(), '<mm-list-name>' : self.real_name, '<mm-email-user>' : self._internal_name, - '<mm-list-description>' : Utils.websafe(self.description), + '<mm-list-description>' : + Utils.websafe(self.GetDescription(cset)), '<mm-list-info>' : '<!---->' + BR.join(self.info.split(NL)) + '<!---->', '<mm-form-end>' : self.FormatFormEnd(), diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 83717f40..8e2518c5 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -262,6 +262,27 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, user = Utils.ObscureEmail(user) return '%s/%s' % (url, urllib.quote(user.lower())) + def GetDescription(self, cset=None, errors='xmlcharrefreplace'): + # Get list's description in charset specified by cset. + # If cset is None, it uses charset of context language. + mcset = Utils.GetCharSet(self.preferred_language) + if cset is None: + # translation context may not be initialized + trns = i18n.get_translation() + if trns is None: + ccset = 'us-ascii' + else: + ccset = i18n.get_translation().charset() or 'us-ascii' + else: + ccset = cset + if isinstance(self.description, unicode): + return self.description.encode(ccset, errors) + if mcset == ccset: + return self.description + return Utils.xml_to_unicode(self.description, mcset).encode(ccset, + errors) + + # # Instance and subcomponent initialization @@ -94,6 +94,10 @@ Here is a history of user visible changes to Mailman. - Approving a held subscription for a user with a 'different' preferred language no longer corrupts the results page. (LP: #1777222) + - An issue with garbled descriptions on listinfo and admin overview pages + and the heading of a list's listinfo page due to incompatible character + sets has been fixed thanks to Yasuhito FUTATSUKI. + Miscellaneous - Added to the contrib directory, a script from Jim Popovitch to generate |