Update of /cvsroot/mailman/mailman/cron
In directory sc8-pr-cvs1:/tmp/cvs-serv2748
Modified Files:
Tag: Release_2_1-maint
checkdbs
Log Message:
pending_requests(): Another part of TK's patch # 865661. Makes sure
the user's full name is encoded in the list's charset properly. It
also makes sure that the Subject description spans exactly one line.
Index: checkdbs
===================================================================
RCS file: /cvsroot/mailman/mailman/cron/checkdbs,v
retrieving revision 2.17.2.2
retrieving revision 2.17.2.3
diff -u -d -r2.17.2.2 -r2.17.2.3
--- checkdbs 20 Apr 2003 04:02:13 -0000 2.17.2.2
+++ checkdbs 26 Dec 2003 22:51:10 -0000 2.17.2.3
@@ -122,6 +122,7 @@
def pending_requests(mlist):
# Must return a byte string
+ lcset = Utils.GetCharSet(mlist.preferred_language)
pending = []
first = 1
for id in mlist.GetSubscriptionIds():
@@ -130,6 +131,8 @@
first = 0
when, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
if fullname:
+ if isinstance(fullname, UnicodeType):
+ fullname = fullname.encode(lcset, 'replace')
fullname = ' (%s)' % fullname
pending.append(' %s%s %s' % (addr, fullname, time.ctime(when)))
first = 1
@@ -139,6 +142,7 @@
first = 0
info = mlist.GetRecord(id)
when, sender, subject, reason, text, msgdata = mlist.GetRecord(id)
+ subject = Utils.oneline(subject, lcset)
date = time.ctime(when)
reason = _(reason)
pending.append(_("""\
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
