aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Bouncer.py2
-rw-r--r--Mailman/Handlers/Acknowledge.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 588e91b1..9f786eb4 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -268,6 +268,8 @@ class Bouncer:
# provided in the exception argument.
sender = msg.get_sender()
subject = msg.get('subject', _('(no subject)'))
+ subject = Utils.oneline(subject,
+ Utils.GetCharSet(self.preferred_language))
if e is None:
notice = _('[No bounce details are available]')
else:
diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/Handlers/Acknowledge.py
index 103448e1..6b462ba9 100644
--- a/Mailman/Handlers/Acknowledge.py
+++ b/Mailman/Handlers/Acknowledge.py
@@ -48,7 +48,7 @@ def process(mlist, msg, msgdata):
realname = mlist.real_name
text = Utils.maketext(
'postack.txt',
- {'subject' : origsubj,
+ {'subject' : Utils.oneline(origsubj, Utils.GetCharSet(lang)),
'listname' : realname,
'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1),
'optionsurl' : mlist.GetOptionsURL(sender, absolute=1),