aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Cgi
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/Cgi')
-rw-r--r--Mailman/Cgi/confirm.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py
index d0f5dea1..214d1b3f 100644
--- a/Mailman/Cgi/confirm.py
+++ b/Mailman/Cgi/confirm.py
@@ -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 @@ def heldmsg_confirm(mlist, doc, cookie):
# 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 @@ def heldmsg_prompt(mlist, doc, cookie, id):
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