diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-23 05:57:21 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-23 05:57:21 +0900 |
| commit | f647dd6c9e7e50b21150076bc9dfc3792f63e022 (patch) | |
| tree | 74fcfa8883921abdd5cc08f35f29852d3a8ec440 /Mailman/HTMLFormatter.py | |
| parent | cb03394bc0ec828ddc23b22392ea8d1a21798644 (diff) | |
| parent | 11c0af19222d0176b4f9c9c515274c61b49eec33 (diff) | |
| download | mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.tar.gz mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.tar.xz mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.zip | |
merge lp:mailman/2.1 up to rev 1784 (release 2.1.27)
Diffstat (limited to '')
| -rw-r--r-- | Mailman/HTMLFormatter.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index a6e1b88f..098a2881 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 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 @@ -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(), |