Update to lp:mailman/2.1 rev 1629 (no difference against the original branch

1 files changed, 8 insertions, 7 deletions

diff --git a/bin/discard b/bin/discard
index c3019844..7a9b890b 100644
--- a/bin/discard
+++ b/bin/discard
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
-# Copyright (C) 2003 by the Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ import getopt
 import paths
 from Mailman import mm_cfg
 from Mailman.MailList import MailList
-from Mailman.i18n import _
+from Mailman.i18n import C_
 
 try:
     True, False
@@ -58,7 +58,7 @@ def usage(code, msg=''):
         fd = sys.stderr
     else:
         fd = sys.stdout
-    print >> fd, _(__doc__)
+    print >> fd, C_(__doc__)
     if msg:
         print >> fd, msg
     sys.exit(code)
@@ -80,7 +80,7 @@ def main():
 
     files = args
     if not files:
-        print _('Nothing to do.')
+        print C_('Nothing to do.')
 
     # Mapping from listnames to sequence of request ids
     discards = {}
@@ -91,13 +91,13 @@ def main():
         basename = os.path.basename(f)
         mo = cre.match(basename)
         if not mo:
-            print >> sys.stderr, _('Ignoring non-held message: %(f)s')
+            print >> sys.stderr, C_('Ignoring non-held message: %(f)s')
             continue
         listname, id = mo.group('listname', 'id')
         try:
             id = int(id)
         except (ValueError, TypeError):
-            print >> sys.stderr, _('Ignoring held msg w/bad id: %(f)s')
+            print >> sys.stderr, C_('Ignoring held msg w/bad id: %(f)s')
             continue
         discards.setdefault(listname, []).append(id)
 
@@ -109,7 +109,8 @@ def main():
                 # No comment, no preserve, no forward, no forwarding address
                 mlist.HandleRequest(id, mm_cfg.DISCARD, '', False, False, '')
                 if not quiet:
-                    print _('Discarded held msg #%(id)s for list %(listname)s')
+                    print C_(
+                          'Discarded held msg #%(id)s for list %(listname)s')
             mlist.Save()
         finally:
             mlist.Unlock()