diff options
| author | bwarsaw | 2000-12-26 18:42:58 +0000 |
|---|---|---|
| committer | bwarsaw | 2000-12-26 18:42:58 +0000 |
| commit | 1f7fd712043c8d7646cbdb3dcf70eb1fbc9a12a4 (patch) | |
| tree | 55195973ecff649c7e7c4624b6e7f4dc71e00ec6 | |
| parent | e5c72c764a5ddb42c1b927d89047c8b2af336043 (diff) | |
| download | mailman-1f7fd712043c8d7646cbdb3dcf70eb1fbc9a12a4.tar.gz mailman-1f7fd712043c8d7646cbdb3dcf70eb1fbc9a12a4.tar.zst mailman-1f7fd712043c8d7646cbdb3dcf70eb1fbc9a12a4.zip | |
Latest set of I18N patches from jcrey. Specifically,
HandleBouncingAddress(): Call maketext() with list's preferred
language. Don't hardcode Content-Type: charset to "us-ascii".
| -rw-r--r-- | Mailman/Bouncer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index b78a2eff3..2996ad5a4 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -212,7 +212,7 @@ class Bouncer: reenable = Utils.maketext( 'reenable.txt', {'admin_url': self.GetScriptURL('admin', absolute=1), - }) + }, self.preferred_language) else: reenable = '' # the mail message text @@ -226,10 +226,10 @@ class Bouncer: 'but' : but, 'reenable' : reenable, 'owneraddr': mm_cfg.MAILMAN_OWNER, - }) + }, self.preferred_language) # add this here so it doesn't get wrapped/filled text = text + '\n\n--' + boundary + \ - '\nContent-type: text/plain; charset=us-ascii\n' + '\nContent-type: text/plain; charset=' + Utils.GetCharSet() # We do this here so this text won't be wrapped. note that # 'bounce.txt' has a trailing newline. Be robust about getting |