------------------------------------------------------------
revno: 1204
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Thu 2009-12-03 17:05:21 -0800
message:
Decoded RFC 2047 encoded message subjects for a few reports. Bug #266428.
modified:
Mailman/Cgi/confirm.py
Mailman/Handlers/Scrubber.py
Mailman/ListAdmin.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription.
=== modified file 'Mailman/Cgi/confirm.py'
--- Mailman/Cgi/confirm.py 2008-02-23 21:16:35 +0000
+++ Mailman/Cgi/confirm.py 2009-12-04 01:05:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 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
@@ -634,8 +634,9 @@
# the user who posted the message.
op, id = mlist.pend_confirm(cookie)
ign, sender, msgsubject, ign, ign, ign = mlist.GetRecord(id)
- subject = Utils.websafe(msgsubject)
lang = mlist.getMemberLanguage(sender)
+ subject = Utils.websafe(Utils.oneline(msgsubject,
+ Utils.GetCharSet(lang)))
i18n.set_language(lang)
doc.set_language(lang)
# Discard the message
@@ -700,7 +701,7 @@
i18n.set_language(lang)
doc.set_language(lang)
- subject = Utils.websafe(msgsubject)
+ subject = Utils.websafe(Utils.oneline(msgsubject, Utils.GetCharSet(lang)))
reason = Utils.websafe(_(givenreason))
listname = mlist.real_name
table.AddRow([_('''Your confirmation is required in order to cancel the
=== modified file 'Mailman/Handlers/Scrubber.py'
--- Mailman/Handlers/Scrubber.py 2009-08-01 23:15:35 +0000
+++ Mailman/Handlers/Scrubber.py 2009-12-04 01:05:21 +0000
@@ -266,6 +266,7 @@
finally:
os.umask(omask)
subject = submsg.get('subject', _('no subject'))
+ subject = Utils.oneline(subject, lcset)
date = submsg.get('date', _('no date'))
who = submsg.get('from', _('unknown sender'))
size = len(str(submsg))
=== modified file 'Mailman/ListAdmin.py'
--- Mailman/ListAdmin.py 2009-08-01 00:40:36 +0000
+++ Mailman/ListAdmin.py 2009-12-04 01:05:21 +0000
@@ -292,9 +292,11 @@
elif value == mm_cfg.REJECT:
# Rejected
rejection = 'Refused'
+ lang = self.getMemberLanguage(sender)
+ subject = Utils.oneline(subject, Utils.GetCharSet(lang))
self.__refuse(_('Posting of your message titled "%(subject)s"'),
sender, comment or _('[No reason given]'),
- lang=self.getMemberLanguage(sender))
+ lang=lang)
else:
assert value == mm_cfg.DISCARD
# Discarded
=== modified file 'NEWS'
--- NEWS 2009-10-13 15:19:00 +0000
+++ NEWS 2009-12-04 01:05:21 +0000
@@ -8,6 +8,9 @@
Bug Fixes and other patches
+ - Decoded RFC 2047 encoded message subjects for a few reports.
+ Bug #266428.
+
- Fixed the French, Spanish and Hebrew translations which improperly
translated the 'coding:' line in bin/config_list output.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
