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, 10 insertions, 10 deletions

diff --git a/bin/mmsitepass b/bin/mmsitepass
index 0bb6e77e..bb4cc712 100755
--- a/bin/mmsitepass
+++ b/bin/mmsitepass
@@ -43,7 +43,7 @@ import getopt
 
 import paths
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman.i18n import C_
 
 PROGRAM = sys.argv[0]
 
@@ -54,7 +54,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)
@@ -70,34 +70,34 @@ def main():
 
     # Defaults
     siteadmin = 1
-    pwdesc = _('site')
+    pwdesc = C_('site')
 
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage(0)
         elif opt in ('-c', '--listcreator'):
             siteadmin = 0
-            pwdesc = _('list creator')
+            pwdesc = C_('list creator')
 
     if len(args) == 1:
         pw1 = args[0]
     else:
         try:
-            pw1 = getpass.getpass(_('New %(pwdesc)s password: '))
-            pw2 = getpass.getpass(_('Again to confirm password: '))
+            pw1 = getpass.getpass(C_('New %(pwdesc)s password: '))
+            pw2 = getpass.getpass(C_('Again to confirm password: '))
             if pw1 <> pw2:
-                print _('Passwords do not match; no changes made.')
+                print C_('Passwords do not match; no changes made.')
                 sys.exit(1)
         except KeyboardInterrupt:
-            print _('Interrupted...')
+            print C_('Interrupted...')
             sys.exit(0)
     # Set the site password by writing it to a local file.  Make sure the
     # permissions don't allow other+read.
     Utils.set_global_password(pw1, siteadmin)
     if Utils.check_global_password(pw1, siteadmin):
-        print _('Password changed.')
+        print C_('Password changed.')
     else:
-        print _('Password change failed.')
+        print C_('Password change failed.')