Merge lp:mailman/2.1 rev 1657

2 files changed, 8 insertions, 1 deletions

diff --git a/Mailman/Queue/ArchRunner.py b/Mailman/Queue/ArchRunner.py
index 62714537..17056e29 100644
--- a/Mailman/Queue/ArchRunner.py
+++ b/Mailman/Queue/ArchRunner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2000-2016 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
@@ -19,6 +19,7 @@
 import time
 from email.Utils import parsedate_tz, mktime_tz, formatdate
 
+from Mailman import i18n
 from Mailman import mm_cfg
 from Mailman import LockFile
 from Mailman.Queue.Runner import Runner
@@ -70,6 +71,9 @@ class ArchRunner(Runner):
             # oh well, try again later
             return 1
         try:
+            # Archiving should be done in the list's preferred language, not
+            # the sender's language.
+            i18n.set_language(mlist.preferred_language)
             mlist.ArchiveMail(msg)
             mlist.Save()
         finally:
diff --git a/NEWS b/NEWS
index 3fd7e75a..4d01e4c1 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Scrubber links in archives are now in the list's preferred_language
+      rather than the poster's language.  (LP: #1586505)
+
     - Improved logging of banned subscription and address change attempts.
       (LP: #1582856)