summaryrefslogtreecommitdiff
path: root/Mailman/Cgi/subscribe.py
diff options
context:
space:
mode:
authorbwarsaw2000-07-24 20:42:21 +0000
committerbwarsaw2000-07-24 20:42:21 +0000
commitb38cdc853633f9c6f6ff50c92e8a80071a126c0f (patch)
treecbc639cc63e460ec9c9427c81d0c109a8062fa26 /Mailman/Cgi/subscribe.py
parent3cd0c109706fdb9cdc0602489d5f71ee4c828e14 (diff)
downloadmailman-b38cdc853633f9c6f6ff50c92e8a80071a126c0f.tar.gz
mailman-b38cdc853633f9c6f6ff50c92e8a80071a126c0f.tar.zst
mailman-b38cdc853633f9c6f6ff50c92e8a80071a126c0f.zip
Applying the patches from SF Bug #109217 that are not specific to
chuqui's site. Specifically, process_form(): slight rewrite of the MMSubscribeNeedsConfirmation text.
Diffstat (limited to 'Mailman/Cgi/subscribe.py')
-rw-r--r--Mailman/Cgi/subscribe.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 78546fa95..1b40e7e4f 100644
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -184,10 +184,13 @@ def process_form(mlist, doc):
results = results + ("The list is not fully functional, and "
"can not accept subscription requests.<p>")
except Errors.MMSubscribeNeedsConfirmation:
- results = results + ("Confirmation from your email address is "
- "required, to prevent anyone from covertly "
- "subscribing you. Instructions are being "
- "sent to you at %s." % email)
+ results = results + ("Confirmation from your email address is "
+ "required, to prevent anyone from "
+ "subscribing you without permission. "
+ "Instructions are being "
+ "sent to you at %s. Please note your "
+ "subscription will not start until you "
+ "confirm your subscription." % email)
except Errors.MMNeedApproval, x:
results = results + ("Subscription was <em>deferred</em> "