From ef7b98da0724c58806106d9f674b63d36e31d0ca Mon Sep 17 00:00:00 2001
From: cotton
Date: Tue, 10 Nov 1998 11:48:14 +0000
Subject: integrated g. steins's mailman reminder patch, so that listinfo.html
 now only states that "your password will be mailed to you once a month" if
 the list is set to do that. scott

---
 Mailman/HTMLFormatter.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Mailman/HTMLFormatter.py')

diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index be95b4fe3..c0d0a8f20 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -181,10 +181,14 @@ class HTMLFormatter:
                          "administrator.  You will be notified of the "
                          "administrator's decision by email.  ")
             also = "also "
-        if self.private_roster:
+        if self.private_roster == 1:
             msg = msg + ("This is %sa private list, which means that "
                          "the members list is not available to non-"
                          "members.  " % also)
+        elif self.private_roster:
+            msg = msg + ("This is %sa hidden list, which means that "
+                         "the members list is available only to the "
+                         "list administrator.  " % also)
         else:
             msg = msg + ("This is %sa public list, which means that the "
                          "members list is openly available" % also)
@@ -314,6 +318,11 @@ class HTMLFormatter:
     def FormatButton(self, name, text='Submit'):
 	return '<INPUT type="Submit" name="%s" value="%s">' % (name, text)
 
+    def FormatReminder(self):
+	if self.send_reminders:
+	    return 'Once a month, your password will be emailed to you as a reminder.'
+	return ''
+
     def ParseTags(self, template, replacements):
 	text = self.SnarfHTMLTemplate(template)
 	parts = regsub.splitx(text, '</?[Mm][Mm]-[^>]*>')
@@ -352,7 +361,8 @@ class HTMLFormatter:
 				  + `len(self.digest_members)`),
 	    '<mm-posting-addr>' : '%s' % self.GetListEmail(),
 	    '<mm-request-addr>' : '%s' % self.GetRequestEmail(),
-	    '<mm-owner>' : self.GetAdminEmail()
+	    '<mm-owner>' : self.GetAdminEmail(),
+	    '<mm-reminder>' : self.FormatReminder(),
 	    }
     
     def InitTemplates(self):
-- 
cgit v1.2.3-70-g09d2