diff options
| author | tkikuchi <> | 2004-09-20 12:20:43 +0000 |
|---|---|---|
| committer | tkikuchi <> | 2004-09-20 12:20:43 +0000 |
| commit | 291039710c75da2faceb550ac9c06aca548a9e5a (patch) | |
| tree | 9eb9757035e2cf57e4286618596d6b968f4748b2 /Mailman | |
| parent | e47f4472576cc7b84dcd07e50f8b080e376f24cf (diff) | |
| download | mailman2-291039710c75da2faceb550ac9c06aca548a9e5a.tar.gz mailman2-291039710c75da2faceb550ac9c06aca548a9e5a.tar.xz mailman2-291039710c75da2faceb550ac9c06aca548a9e5a.zip | |
Use Utils.oneline() where applicable.
Closing [ 1003070 ] Decode original subject in post acknowledgement
by Soji IKEDA
Modified Files:
Tag: Release_2_1-maint
Mailman/Bouncer.py
Mailman/Handlers/Acknowledge.py
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Bouncer.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Acknowledge.py | 2 |
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), |