aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Archiver/HyperArch.py4
-rw-r--r--NEWS5
2 files changed, 7 insertions, 2 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index d4fc5d9a..33a389ed 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 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
@@ -574,8 +574,8 @@ class Article(pipermail.Article):
if mm_cfg.ARCHIVER_OBSCURES_EMAILADDRS:
otrans = i18n.get_translation()
try:
- atmark = unicode(_(' at '), cset)
i18n.set_language(self._lang)
+ atmark = unicode(_(' at '), cset)
body = re.sub(r'([-+,.\w]+)@([-+.\w]+)',
'\g<1>' + atmark + '\g<2>', body)
finally:
diff --git a/NEWS b/NEWS
index 99d0d3be..c1aa2c46 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,11 @@ Here is a history of user visible changes to Mailman.
instead of bad listname when the list name had non-ascii characters.
SF Bug #2126489.
+ - Fixed an issue where in some circumstances HyperArch.py would translate
+ ' at ' into the wrong language ultimately throwing a UnicodeDecodeError
+ when the translation was decoded with a different character set.
+ Bug #308152.
+
2.1.11 (30-Jun-2008)
New Features