diff options
| author | bwarsaw | 2002-09-13 16:51:31 +0000 |
|---|---|---|
| committer | bwarsaw | 2002-09-13 16:51:31 +0000 |
| commit | e88f1ab55c09816a600262f6de570cf54cd6c4a0 (patch) | |
| tree | e6425b43be369c2bf466e2231dadbf37834afcb6 | |
| parent | 4028ee396d454b5981d7bb6d88dbb31071a564e0 (diff) | |
| download | mailman-e88f1ab55c09816a600262f6de570cf54cd6c4a0.tar.gz mailman-e88f1ab55c09816a600262f6de570cf54cd6c4a0.tar.zst mailman-e88f1ab55c09816a600262f6de570cf54cd6c4a0.zip | |
| -rw-r--r-- | Mailman/Cgi/confirm.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index e5f93f22e..c728b896d 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -230,7 +230,7 @@ def subscription_prompt(mlist, doc, cookie, userdesc): <p>Or hit <em>Cancel and discard</em> to cancel this subscription request.""") + '<p><hr>' - if mlist.subscribe_policy in (1, 3): + if mlist.subscribe_policy in (2, 3): # Confirmation is required result = _("""Your confirmation is required in order to continue with the subscription request to the mailing list <em>%(listname)s</em>. @@ -330,6 +330,8 @@ def subscription_confirm(mlist, doc, cookie, cgidata): bad_confirmation(doc, _('''Invalid confirmation string. It is possible that you are attempting to confirm a request for an address that has already been unsubscribed.''')) + except Errors.MMAlreadyAMember: + doc.addError(_("You are already a member of this mailing list!")) else: # Use the user's preferred language i18n.set_language(lang) |