From d3b8055fdda07338ac0b2de59613da2b34433412 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 17 Jun 2018 16:47:34 -0700 Subject: Bump copyright dates. --- Mailman/MailList.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Mailman/MailList.py (limited to 'Mailman/MailList.py') diff --git a/Mailman/MailList.py b/Mailman/MailList.py old mode 100755 new mode 100644 -- cgit v1.2.3 From cecee6f6238d162a161bc1f6da13783fde2f0895 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Mon, 18 Jun 2018 04:35:51 -0700 Subject: Added global _ where needed. --- Mailman/MailList.py | 1 + 1 file changed, 1 insertion(+) (limited to 'Mailman/MailList.py') diff --git a/Mailman/MailList.py b/Mailman/MailList.py index d2a15e29..83717f40 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -1301,6 +1301,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, # Confirmation processing # def ProcessConfirmation(self, cookie, context=None): + global _ rec = self.pend_confirm(cookie) if rec is None: raise Errors.MMBadConfirmation, 'No cookie record for %s' % cookie -- cgit v1.2.3 From 6a3bbdd20a8fac82f161f353c40604387f52cb09 Mon Sep 17 00:00:00 2001 From: Yasuhito FUTATSUKI at POEM Date: Fri, 22 Jun 2018 01:23:09 +0900 Subject: enhance i18n of listinfo overview * make sure list's description charset as its preferred_language's * get description as a string of charset caller wanted --- Mailman/MailList.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'Mailman/MailList.py') 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 -- cgit v1.2.3