Merge lp:mailman/2.1 up to rev 1702(no difference to lp:mailman/2.1, now)

3 files changed, 23 insertions, 8 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 6ad5d7ab..7a2dc526 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -1087,7 +1087,7 @@ DEFAULT_MAX_MESSAGE_SIZE = 40           # KB
 DEFAULT_SUBJECT_PREFIX  = "[%(real_name)s] "
 # DEFAULT_SUBJECT_PREFIX = "[%(real_name)s %%d]" # for numbering
 DEFAULT_MSG_HEADER = ""
-DEFAULT_MSG_FOOTER = """_______________________________________________
+DEFAULT_MSG_FOOTER = """-- 
 %(real_name)s mailing list
 %(real_name)s@%(host_name)s
 %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
@@ -1397,7 +1397,10 @@ DEFAULT_NONDIGESTABLE = Yes
 # Will list be available in digested form?
 DEFAULT_DIGESTABLE = Yes
 DEFAULT_DIGEST_HEADER = ""
-DEFAULT_DIGEST_FOOTER = DEFAULT_MSG_FOOTER
+DEFAULT_DIGEST_FOOTER = """%(real_name)s mailing list
+%(real_name)s@%(host_name)s
+%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
+"""
 
 DEFAULT_DIGEST_IS_DEFAULT = No
 DEFAULT_MIME_IS_DEFAULT_DIGEST = No
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 84d3032d..3e2806f0 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
@@ -423,9 +423,11 @@ def prefix_subject(mlist, msg, msgdata):
         recolon = 'Re:'
     else:
         recolon = ''
+    # Strip leading and trailing whitespace from subject.
+    subject = subject.strip()
     # At this point, subject may become null if someone post mail with
-    # subject: [subject prefix]
-    if subject.strip() == '':
+    # Subject: [subject prefix]
+    if subject == '':
         # We want the i18n context to be the list's preferred_language.  It
         # could be the poster's.
         otrans = i18n.get_translation()
@@ -462,10 +464,10 @@ def prefix_subject(mlist, msg, msgdata):
             pass
     # Get the header as a Header instance, with proper unicode conversion
     # Because of rfc2047 encoding, spaces between encoded words can be
-    # insignificant, so we need to append a space to prefix but only when
-    # we have Re:.
+    # insignificant, so we need to append spaces to our encoded stuff.
+    prefix += ' '
     if recolon:
-        prefix += ' '
+        recolon += ' '
     if old_style:
         h = uheader(mlist, recolon, 'Subject', continuation_ws=ws)
         h.append(prefix)
diff --git a/NEWS b/NEWS
index 083f4027..2bd0e9b0 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,11 @@ Here is a history of user visible changes to Mailman.
     - cron/senddigests has a new -e/--exceptlist option to send pending
       digests for all but a named list.  (LP: #1619770)
 
+    - The values for DEFAULT_DIGEST_FOOTER and DEFAULT_MSG_FOOTER have been
+      changed to use a standard signature separator for DEFAULT_MSG_FOOTER
+      and to remove the unneded line of underscores from DEFAULT_DIGEST_FOOTER.
+      (LP: #266269)
+
   i18n
 
     - The Polish html templates have been recoded to use html entities
@@ -32,6 +37,11 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Subject prefixing has been improved to always have a space between
+      the prefix and the subject even with non-ascii in the prefix.  This
+      will sometimes result in two spaces when the prefix is non-ascii but
+      the subject is ascii, but this is the lesser evil.  (LP: #1525954)
+
     - Treat message and digest headers and footers as empty if they contain
       only whitespace.  (LP: #1673307)