Importing locale patch for command line utils, from RHEL6 rpm source

(for -japan-poem, originally imported from 2.1.12-18 package for RHEL6
rpm source)

1 files changed, 8 insertions, 8 deletions

diff --git a/bin/dumpdb b/bin/dumpdb
index c8e42462..0b58fae9 100644
--- a/bin/dumpdb
+++ b/bin/dumpdb
@@ -54,7 +54,7 @@ from types import StringType
 
 import paths
 # Import this /after/ paths so that the sys.path is properly hacked
-from Mailman.i18n import _
+from Mailman.i18n import C_
 
 PROGRAM = sys.argv[0]
 COMMASPACE = ', '
@@ -72,7 +72,7 @@ def usage(code, msg=''):
         fd = sys.stderr
     else:
         fd = sys.stdout
-    print >> fd, _(__doc__) % globals()
+    print >> fd, C_(__doc__) % globals()
     if msg:
         print >> fd, msg
     sys.exit(code)
@@ -102,10 +102,10 @@ def main():
             doprint = False
 
     if len(args) < 1:
-        usage(1, _('No filename given.'))
+        usage(1, C_('No filename given.'))
     elif len(args) > 1:
         pargs = COMMASPACE.join(args)
-        usage(1, _('Bad arguments: %(pargs)s'))
+        usage(1, C_('Bad arguments: %(pargs)s'))
     else:
         filename = args[0]
 
@@ -115,7 +115,7 @@ def main():
         elif filename.endswith('.pck'):
             filetype = 0
         else:
-            usage(1, _('Please specify either -p or -m.'))
+            usage(1, C_('Please specify either -p or -m.'))
 
     # Handle dbs
     pp = pprint.PrettyPrinter(indent=4)
@@ -130,16 +130,16 @@ def main():
     try:
         cnt = 1
         if doprint:
-            print _('[----- start %(typename)s file -----]')
+            print C_('[----- start %(typename)s file -----]')
         while True:
             try:
                 obj = load(fp)
             except EOFError:
                 if doprint:
-                    print _('[----- end %(typename)s file -----]')
+                    print C_('[----- end %(typename)s file -----]')
                 break
             if doprint:
-                print _('<----- start object %(cnt)s ----->')
+                print C_('<----- start object %(cnt)s ----->')
                 if isinstance(obj, StringType):
                     print obj
                 else: