summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/HTMLFormatter.py17
1 files changed, 17 insertions, 0 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index 573fe2cdc..b5e640f29 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -149,6 +149,16 @@ class HTMLFormatter:
else:
return ""
+ def FormatUmbrellaNotice(self, user, type):
+ if self.umbrella_list:
+ acct, host = tuple(string.split(user, '@'))
+ return ("(Note - you are subscribing to a list of maillists, so"
+ " the %s notice will be sent to the admin address"
+ " for your membership, %s%s@%s.)<p>"
+ % (type, acct, self.umbrella_member_suffix, host))
+ else:
+ return ""
+
def FormatSubscriptionMsg(self):
"Tailor to approval, roster privacy, and web vetting requirements."
msg = ""
@@ -184,6 +194,13 @@ class HTMLFormatter:
else:
msg = msg + ". "
+ if self.umbrella_list:
+ msg = msg + ("<p>(Note that this is an umbrella list, intended to"
+ " have only other maillists as members. Among"
+ " other things, this means that your confirmation"
+ " request will be sent to the '%s' account for"
+ " your address.)" % self.umbrella_member_suffix)
+
return msg
def FormatUndigestButton(self):