Merge authors:
Jim Popovitch (jimpop)
Related merge proposals:
https://code.launchpad.net/~jimpop/mailman/owner-notification-whence/+merge/347785
proposed by: Jim Popovitch (jimpop)
------------------------------------------------------------
revno: 1769 [merge]
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Mon 2018-06-11 19:29:33 -0700
message:
Added %(whence)s replacement for admin (un)subscribe notices.
modified:
Mailman/MailList.py
NEWS
templates/en/adminsubscribeack.txt
templates/en/adminunsubscribeack.txt
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/MailList.py'
--- Mailman/MailList.py 2018-06-10 23:01:35 +0000
+++ Mailman/MailList.py 2018-06-12 02:29:33 +0000
@@ -1069,6 +1069,7 @@
"adminsubscribeack.txt",
{"listname" : realname,
"member" : formataddr((name, email)),
+ "whence" : "" if whence is None else "(" + whence + ")"
}, mlist=self)
msg = Message.OwnerNotification(self, subject, text)
msg.send(self)
@@ -1105,6 +1106,7 @@
'adminunsubscribeack.txt',
{'member' : name,
'listname': self.real_name,
+ "whence" : "" if whence is None else "(" + whence + ")"
}, mlist=self)
msg = Message.OwnerNotification(self, subject, text)
msg.send(self)
=== modified file 'NEWS'
--- NEWS 2018-06-11 16:59:26 +0000
+++ NEWS 2018-06-12 02:29:33 +0000
@@ -39,6 +39,11 @@
'mischief' log entries for 'hostile listname' noe include the remote IP
if available.
+ - Thanks to Jim Popovitch, admin notices of (un)subscribes now may give
+ the source of the action. This consists of a %(whence)s replacement
+ that can be added to the admin(un)subscribeack.txt templates. This
+ has been done for the 'en' templates, but not for most others.
+
i18n
- The Japanese translation has been updated by Yasuhito FUTATSUKI.
=== modified file 'templates/en/adminsubscribeack.txt'
--- templates/en/adminsubscribeack.txt 2003-01-02 05:25:50 +0000
+++ templates/en/adminsubscribeack.txt 2018-06-12 02:29:33 +0000
@@ -1,3 +1,3 @@
%(member)s has been successfully subscribed to %(listname)s.
-
+%(whence)s
=== modified file 'templates/en/adminunsubscribeack.txt'
--- templates/en/adminunsubscribeack.txt 2003-01-02 05:25:50 +0000
+++ templates/en/adminunsubscribeack.txt 2018-06-12 02:29:33 +0000
@@ -1,2 +1,3 @@
%(member)s has been removed from %(listname)s.
+%(whence)s
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
