aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/HTMLFormatter.py
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2018-06-22 08:36:36 -0700
committerMark Sapiro <mark@msapiro.net>2018-06-22 08:36:36 -0700
commit594de91c05384ab6136adfcc9db68f97af3a9d89 (patch)
tree35cbccf142e90c0a11f5e52ab64fb94b35db51b1 /Mailman/HTMLFormatter.py
parent388b4a41ece74d11298e640429bef5f903221d09 (diff)
parentfe5ed76b93d5d8e727a2f04e831794ab6db659c8 (diff)
downloadmailman2-594de91c05384ab6136adfcc9db68f97af3a9d89.tar.gz
mailman2-594de91c05384ab6136adfcc9db68f97af3a9d89.tar.xz
mailman2-594de91c05384ab6136adfcc9db68f97af3a9d89.zip
Fixed garbled descriptions on admin and listinfo pages.
Diffstat (limited to '')
-rw-r--r--Mailman/HTMLFormatter.py7
1 files changed, 6 insertions, 1 deletions
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(),