Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv6902/Mailman/Cgi

Modified Files:
      Tag: Release_2_1-maint
        admin.py admindb.py listinfo.py 
Log Message:
Backporting from the HEAD -- updated cgi's









Index: admin.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admin.py,v
retrieving revision 2.86.2.2
retrieving revision 2.86.2.3
diff -u -d -r2.86.2.2 -r2.86.2.3
--- admin.py    31 Mar 2003 21:49:40 -0000      2.86.2.2
+++ admin.py    22 Sep 2003 02:39:34 -0000      2.86.2.3
@@ -794,7 +794,9 @@
     # If there are more members than allowed by chunksize, then we split the
     # membership up alphabetically.  Otherwise just display them all.
     chunksz = mlist.admin_member_chunksize
-    all = mlist.getMembers()
+    # The email addresses had /better/ be ASCII, but might be encoded in the
+    # database as Unicodes.
+    all = [_m.encode() for _m in mlist.getMembers()]
     all.sort(lambda x, y: cmp(x.lower(), y.lower()))
     # See if the query has a regular expression
     regexp = cgidata.getvalue('findmember', '').strip()

Index: admindb.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admindb.py,v
retrieving revision 2.45.2.1
retrieving revision 2.45.2.2
diff -u -d -r2.45.2.1 -r2.45.2.2
--- admindb.py  8 Feb 2003 07:13:49 -0000       2.45.2.1
+++ admindb.py  22 Sep 2003 02:39:34 -0000      2.45.2.2
@@ -431,7 +431,7 @@
             left.AddRow([
                 CheckBox('senderfilterp-' + qsender, 1).Format() +
                 ' ' +
-                _('Add <b>%(esender)s</b> to a sender filter')
+                _('Add <b>%(esender)s</b> to one of these sender filters:')
                 ])
             left.AddCellInfo(left.GetCurrentRowIndex(), 0, colspan=2)
             btns = hacky_radio_buttons(

Index: listinfo.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/listinfo.py,v
retrieving revision 2.24.2.1
retrieving revision 2.24.2.2
diff -u -d -r2.24.2.1 -r2.24.2.2
--- listinfo.py 8 Feb 2003 07:13:50 -0000       2.24.2.1
+++ listinfo.py 22 Sep 2003 02:39:34 -0000      2.24.2.2
@@ -122,7 +122,7 @@
          Link(Utils.ScriptURL('admin'),
               _('the list admin overview page')),
          _(''' to find the management interface for your list.
-         <p>Send questions or comments to '''),
+         <p>If you are having trouble using the lists, please contact '''),
          Link('mailto:' + siteowner, siteowner),
          '.<p>'))
 



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to