summaryrefslogtreecommitdiff
path: root/Mailman/HTMLFormatter.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/HTMLFormatter.py')
-rw-r--r--Mailman/HTMLFormatter.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index bc6a41aab..573fe2cdc 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -153,16 +153,24 @@ class HTMLFormatter:
"Tailor to approval, roster privacy, and web vetting requirements."
msg = ""
also = ""
- if self.web_subscribe_requires_confirmation:
+ if self.subscribe_policy == 1:
msg = msg + ("You will be sent email requesting confirmation, "
"to prevent others from gratuitously subscribing "
"you. ")
- if not self.open_subscribe:
+ if self.subscribe_policy == 2:
msg = msg + ("This is a closed list, which means your "
"subscription will be held for approval. You will "
- "be notified of the administrators decision by "
+ "be notified of the administrator's decision by "
"email. ")
also = "also "
+ if self.subscribe_policy == 3:
+ msg = msg + ("You will be sent email requesting confirmation, "
+ "to prevent others from gratuitously subscribing "
+ "you. Once confirmation is received, your "
+ "request will be held for approval by the list "
+ "administrator. You will be notified of the "
+ "administrator's decision by email. ")
+ also = "also "
if self.private_roster:
msg = msg + ("This is %sa private list, which means that "
"the members list is not available to non-"