diff options
| author | Jim Popovitch <jimpop@domainmail.org> | 2018-06-12 02:05:08 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@domainmail.org> | 2018-06-12 02:05:08 +0000 |
| commit | 4c54a401f9070bcb385a44bbaec8c08facb10ee4 (patch) | |
| tree | 587d89dab3a56a02cd4e329d7799d0f925656eb3 | |
| parent | d363c183a208a1ef34847656533cb818d7a7cf50 (diff) | |
| download | mailman2-4c54a401f9070bcb385a44bbaec8c08facb10ee4.tar.gz mailman2-4c54a401f9070bcb385a44bbaec8c08facb10ee4.tar.xz mailman2-4c54a401f9070bcb385a44bbaec8c08facb10ee4.zip | |
Add whence to owner subscribe|unsubscribe notifications.
Diffstat (limited to '')
| -rwxr-xr-x | Mailman/MailList.py | 2 | ||||
| -rw-r--r-- | templates/en/adminsubscribeack.txt | 2 | ||||
| -rw-r--r-- | templates/en/adminunsubscribeack.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index fdc3802a..1755ae64 100755 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -1069,6 +1069,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, "adminsubscribeack.txt", {"listname" : realname, "member" : formataddr((name, email)), + "whence" : "" if whence == None else " (" + whence + ")" }, mlist=self) msg = Message.OwnerNotification(self, subject, text) msg.send(self) @@ -1105,6 +1106,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, 'adminunsubscribeack.txt', {'member' : name, 'listname': self.real_name, + "whence" : "" if whence == None else " (" + whence + ")" }, mlist=self) msg = Message.OwnerNotification(self, subject, text) msg.send(self) diff --git a/templates/en/adminsubscribeack.txt b/templates/en/adminsubscribeack.txt index 388a3a24..f5d94e36 100644 --- a/templates/en/adminsubscribeack.txt +++ b/templates/en/adminsubscribeack.txt @@ -1,3 +1,3 @@ -%(member)s has been successfully subscribed to %(listname)s. +%(member)s has been successfully subscribed to %(listname)s%(whence)s. diff --git a/templates/en/adminunsubscribeack.txt b/templates/en/adminunsubscribeack.txt index 2ebcfeb7..5b30f805 100644 --- a/templates/en/adminunsubscribeack.txt +++ b/templates/en/adminunsubscribeack.txt @@ -1,2 +1,2 @@ -%(member)s has been removed from %(listname)s. +%(member)s has been removed from %(listname)s%(whence)s. |