diff options
| author | Francesco Ariis | 2016-08-24 14:36:30 +0000 |
|---|---|---|
| committer | Francesco Ariis | 2016-08-25 08:35:12 +0200 |
| commit | fd4dd866b540051782c878e7bb115cc5fa4abaa7 (patch) | |
| tree | bf06764264852be466a1adbe24ae86ab1f4412ab /src/mailman/utilities | |
| parent | df929b21f9afc917cb515aca613fc925f6c9d1d0 (diff) | |
| download | mailman-fd4dd866b540051782c878e7bb115cc5fa4abaa7.tar.gz mailman-fd4dd866b540051782c878e7bb115cc5fa4abaa7.tar.zst mailman-fd4dd866b540051782c878e7bb115cc5fa4abaa7.zip | |
Added unsubscribe instructions to list:member:generic:footer.txt
Diffstat (limited to 'src/mailman/utilities')
| -rw-r--r-- | src/mailman/utilities/importer.py | 6 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_import.py | 6 |
2 files changed, 8 insertions, 4 deletions
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) |