Backporting from the HEAD -- updated cgi's

3 files changed, 5 insertions, 3 deletions

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 17b3919f..949689c2 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -794,7 +794,9 @@ def membership_options(mlist, subcat, cgidata, doc, form):
     # 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()
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index 49007fb6..05532f03 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -431,7 +431,7 @@ def show_helds_overview(mlist, form):
             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(
diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py
index 5244d75c..fb9154ae 100644
--- a/Mailman/Cgi/listinfo.py
+++ b/Mailman/Cgi/listinfo.py
@@ -122,7 +122,7 @@ def listinfo_overview(msg=''):
          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>'))