------------------------------------------------------------
revno: 1078
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Sun 2009-09-20 16:04:44 -0700
message:
Changed the response to an invalid confirmation to be more generic.
Not all confirmations are subscription requests.
modified:
Mailman/Cgi/confirm.py
Mailman/Commands/cmd_confirm.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
=== modified file 'Mailman/Cgi/confirm.py'
--- Mailman/Cgi/confirm.py 2008-02-23 21:16:35 +0000
+++ Mailman/Cgi/confirm.py 2009-09-20 23:04:44 +0000
@@ -97,8 +97,9 @@
%(safecookie)s.
<p>Note that confirmation strings expire approximately
- %(days)s days after the initial subscription request. If your
- confirmation has expired, please try to re-submit your subscription.
+ %(days)s days after the initial request. They also expire if the
+ request has already been handled in some way. If your confirmation
+ has expired, please try to re-submit your request.
Otherwise, <a href="%(confirmurl)s">re-enter</a> your confirmation
string.''')
=== modified file 'Mailman/Commands/cmd_confirm.py'
--- Mailman/Commands/cmd_confirm.py 2008-02-20 04:26:57 +0000
+++ Mailman/Commands/cmd_confirm.py 2009-09-20 23:04:44 +0000
@@ -49,9 +49,9 @@
days = int(mm_cfg.PENDING_REQUEST_LIFE / mm_cfg.days(1) + 0.5)
res.results.append(_("""\
Invalid confirmation string. Note that confirmation strings expire
-approximately %(days)s days after the initial subscription request. If your
-confirmation has expired, please try to re-submit your original request or
-message."""))
+approximately %(days)s days after the initial request. They also expire if
+the request has already been handled in some way. If your confirmation has
+expired, please try to re-submit your original request or message."""))
except Errors.MMNeedApproval:
res.results.append(_("""\
Your request has been forwarded to the list moderator for approval."""))
=== modified file 'NEWS'
--- NEWS 2009-09-13 22:49:34 +0000
+++ NEWS 2009-09-20 23:04:44 +0000
@@ -46,6 +46,9 @@
Bug fixes and other patches
+ - Changed the response to an invalid confirmation to be more generic.
+ Not all confirmations are subscription requests.
+
- Changed the default nonmember_rejection_notice to be more user friendly.
Bug #418728.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
