diff options
| -rw-r--r-- | src/mailman/app/docs/pipelines.rst | 8 | ||||
| -rw-r--r-- | src/mailman/runners/docs/digester.rst | 8 | ||||
| -rw-r--r-- | src/mailman/templates/en/list:member:generic:footer.txt | 4 | ||||
| -rw-r--r-- | src/mailman/utilities/importer.py | 6 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_import.py | 6 |
5 files changed, 18 insertions, 14 deletions
diff --git a/src/mailman/app/docs/pipelines.rst b/src/mailman/app/docs/pipelines.rst index 4022251f7..090d77c49 100644 --- a/src/mailman/app/docs/pipelines.rst +++ b/src/mailman/app/docs/pipelines.rst @@ -61,8 +61,8 @@ etc. <BLANKLINE> First post! _______________________________________________ - Test mailing list - test@example.com + Test mailing list -- test@example.com + To unsubscribe send an email to test-leave@example.com <BLANKLINE> The message metadata has information about recipients and other stuff. @@ -134,8 +134,8 @@ delivered to end recipients. First post! <BLANKLINE> _______________________________________________ - Test mailing list - test@example.com + Test mailing list -- test@example.com + To unsubscribe send an email to test-leave@example.com >>> dump_msgdata(messages[0].msgdata) _parsemsg : False diff --git a/src/mailman/runners/docs/digester.rst b/src/mailman/runners/docs/digester.rst index ea31761a1..f4776b32d 100644 --- a/src/mailman/runners/docs/digester.rst +++ b/src/mailman/runners/docs/digester.rst @@ -218,8 +218,8 @@ The MIME digest has lots of good stuff, all contained in the multipart. Content-Description: Digest Footer <BLANKLINE> _______________________________________________ - Test mailing list - test@example.com + Test mailing list -- test@example.com + To unsubscribe send an email to test-leave@example.com <BLANKLINE> --===============...==-- <BLANKLINE> @@ -295,8 +295,8 @@ The RFC 1153 contains the digest in a single plain text message. Subject: Digest Footer <BLANKLINE> _______________________________________________ - Test mailing list - test@example.com + Test mailing list -- test@example.com + To unsubscribe send an email to test-leave@example.com <BLANKLINE> <BLANKLINE> ------------------------------ diff --git a/src/mailman/templates/en/list:member:generic:footer.txt b/src/mailman/templates/en/list:member:generic:footer.txt index 5985feb6e..bea92d5ff 100644 --- a/src/mailman/templates/en/list:member:generic:footer.txt +++ b/src/mailman/templates/en/list:member:generic:footer.txt @@ -1,3 +1,3 @@ _______________________________________________ -$display_name mailing list -$listname +$display_name mailing list -- $listname +To unsubscribe send an email to ${short_listname}-leave@${domain} diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index c908a2ada..00c30c9f0 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -388,8 +388,10 @@ def import_config_pck(mlist, config_dict): # order dependent; the longer substitution with the common prefix must # show up earlier. convert_placeholders = [ - ('%(real_name)s@%(host_name)s', '$listname'), - ('%(real_name)s', '$display_name'), + ('%(real_name)s@%(host_name)s', + 'To unsubscribe send an email to ${short_listname}-leave@${domain}'), + ('%(real_name)s mailing list', + '$display_name mailing list -- $listname'), # The generic footers no longer have URLs in them. ('%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s\n', ''), ] diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py index d2729e8e1..ca3a4afb7 100644 --- a/src/mailman/utilities/tests/test_import.py +++ b/src/mailman/utilities/tests/test_import.py @@ -666,8 +666,10 @@ class TestConvertToURI(unittest.TestCase): def test_substitutions(self): test_text = ('UNIT TESTING %(real_name)s mailing list\n' '%(real_name)s@%(host_name)s') - expected_text = ('UNIT TESTING $display_name mailing list\n' - '$listname') + expected_text = ('UNIT TESTING $display_name mailing list ' + '-- $listname\n' + 'To unsubscribe send an email to ' + '${short_listname}-leave@${domain}') for oldvar, newvar in self._conf_mapping.items(): self._pckdict[str(oldvar)] = str(test_text) import_config_pck(self._mlist, self._pckdict) |