areguera / rpms / mailman

Forked from rpms/mailman 4 years ago
Clone

Blame SOURCES/mailman-2.1.9-ctypo-new.patch

7812c9
diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
7812c9
index c4f21e4..0a8395b 100644
7812c9
--- a/Mailman/MTA/Postfix.py
7812c9
+++ b/Mailman/MTA/Postfix.py
7812c9
@@ -362,9 +362,9 @@ def checkperms(state):
7812c9
         if stat and (stat[ST_MODE] & targetmode) <> targetmode:
7812c9
             state.ERRORS += 1
7812c9
             octmode = oct(stat[ST_MODE])
7812c9
-            print _('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
7812c9
+            print C_('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
7812c9
             if state.FIX:
7812c9
-                print _('(fixing)')
7812c9
+                print C_('(fixing)')
7812c9
                 os.chmod(dbfile, stat[ST_MODE] | targetmode)
7812c9
             else:
7812c9
                 print
7812c9
diff --git a/bin/change_pw b/bin/change_pw
7812c9
index 35be13d..b9a36de 100644
7812c9
--- a/bin/change_pw
7812c9
+++ b/bin/change_pw
7812c9
@@ -187,8 +187,8 @@ def main():
7812c9
                 adminurl = mlist.GetScriptURL('admin', absolute=1)
7812c9
                 msg = Message.UserNotification(
7812c9
                     mlist.owner[:], Utils.get_site_email(),
7812c9
-                    _('Your new %(listname)s list password'),
7812c9
-                    _('''\
7812c9
+                    C_('Your new %(listname)s list password'),
7812c9
+                    C_('''\
7812c9
 The site administrator at %(hostname)s has changed the password for your
7812c9
 mailing list %(listname)s.  It is now
7812c9
 
7812c9
diff --git a/bin/check_perms b/bin/check_perms
7812c9
index f0c6795..5ef3306 100755
7812c9
--- a/bin/check_perms
7812c9
+++ b/bin/check_perms
7812c9
@@ -221,7 +221,7 @@ def checkarchives():
7812c9
     # In addition, on a multiuser system you may want to hide the private
7812c9
     # archives so other users can't read them.
7812c9
     if mode & S_IXOTH:
7812c9
-        print _("""\
7812c9
+        print C_("""\
7812c9
 Warning: Private archive directory is other-executable (o+x).
7812c9
          This could allow other users on your system to read private archives.
7812c9
          If you're on a shared multiuser system, you should consult the
7812c9
diff --git a/bin/clone_member b/bin/clone_member
7812c9
index d9ff224..b262aab 100755
7812c9
--- a/bin/clone_member
7812c9
+++ b/bin/clone_member
7812c9
@@ -133,7 +133,7 @@ def dolist(mlist, options):
7812c9
     pattern = mlist.GetBannedPattern(options.toaddr)
7812c9
     if pattern:
7812c9
         if not options.quiet:
7812c9
-            print '   ', _('Banned address (matched %(pattern)s)')
7812c9
+            print '   ', C_('Banned address (matched %(pattern)s)')
7812c9
         return
7812c9
 
7812c9
     # Now change the membership address
7812c9
diff --git a/bin/fix_url.py b/bin/fix_url.py
7812c9
index 6523ce2..d4840be 100644
7812c9
--- a/bin/fix_url.py
7812c9
+++ b/bin/fix_url.py
7812c9
@@ -72,7 +72,7 @@ def fix_url(mlist, *args):
7812c9
     # Make sure list is locked.
7812c9
     if not mlist.Locked():
7812c9
         if verbose:
7812c9
-            print _('Locking list')
7812c9
+            print C_('Locking list')
7812c9
         mlist.Lock()
7812c9
     if urlhost:
7812c9
         web_page_url = mm_cfg.DEFAULT_URL_PATTERN % urlhost
7812c9
diff --git a/bin/genaliases b/bin/genaliases
7812c9
index 29e5b5a..d6b9f07 100644
7812c9
--- a/bin/genaliases
7812c9
+++ b/bin/genaliases
7812c9
@@ -81,7 +81,7 @@ def main():
7812c9
 
7812c9
     if not mm_cfg.MTA:
7812c9
         mta = repr(mm_cfg.MTA)
7812c9
-        usage(2, _(
7812c9
+        usage(2, C_(
7812c9
             "genaliases can't do anything useful with mm_cfg.MTA = %(mta)s."
7812c9
              ))
7812c9
 
7812c9
diff --git a/bin/newlist b/bin/newlist
7812c9
index 7000396..e52f340 100755
7812c9
--- a/bin/newlist
7812c9
+++ b/bin/newlist
7812c9
@@ -248,7 +248,7 @@ def main():
7812c9
         try:
7812c9
             msg = Message.UserNotification(
7812c9
                 owner_mail, siteowner,
7812c9
-                _('Your new mailing list: %(listname)s'),
7812c9
+                C_('Your new mailing list: %(listname)s'),
7812c9
                 text, mlist.preferred_language)
7812c9
             msg.send(mlist)
7812c9
         finally:
7812c9
diff --git a/bin/reset_pw.py b/bin/reset_pw.py
7812c9
index e829aef..b71d532 100644
7812c9
--- a/bin/reset_pw.py
7812c9
+++ b/bin/reset_pw.py
7812c9
@@ -38,7 +38,7 @@ import getopt
7812c9
 
7812c9
 import paths
7812c9
 from Mailman import Utils
7812c9
-from Mailman.i18n import _
7812c9
+from Mailman.i18n import C_
7812c9
 
7812c9
 
7812c9
 try:
7812c9
@@ -54,7 +54,7 @@ def usage(code, msg=''):
7812c9
         fd = sys.stderr
7812c9
     else:
7812c9
         fd = sys.stdout
7812c9
-    print >> fd, _(__doc__.replace('%', '%%'))
7812c9
+    print >> fd, C_(__doc__.replace('%', '%%'))
7812c9
     if msg:
7812c9
         print >> fd, msg
7812c9
     sys.exit(code)
7812c9
@@ -74,13 +74,13 @@ def reset_pw(mlist, *args):
7812c9
 
7812c9
     listname = mlist.internal_name()
7812c9
     if verbose:
7812c9
-        print _('Changing passwords for list: %(listname)s')
7812c9
+        print C_('Changing passwords for list: %(listname)s')
7812c9
 
7812c9
     for member in mlist.getMembers():
7812c9
         randompw = Utils.MakeRandomPassword()
7812c9
         mlist.setMemberPassword(member, randompw)
7812c9
         if verbose:
7812c9
-            print _('New password for member %(member)40s: %(randompw)s')
7812c9
+            print C_('New password for member %(member)40s: %(randompw)s')
7812c9
 
7812c9
     mlist.Save()
7812c9
 
7812c9
diff --git a/bin/sync_members b/bin/sync_members
7812c9
index d302243..26a5e58 100755
7812c9
--- a/bin/sync_members
7812c9
+++ b/bin/sync_members
7812c9
@@ -261,7 +261,7 @@ def main():
7812c9
             except Errors.MMAlreadyAMember:
7812c9
                 pass
7812c9
             except Errors.MembershipIsBanned, pattern:
7812c9
-                print ('%s:' % addr), _('Banned address (matched %(pattern)s)')
7812c9
+                print ('%s:' % addr), C_('Banned address (matched %(pattern)s)')
7812c9
 
7812c9
         for laddr, addr in addrs.items():
7812c9
             # Should be a member, otherwise our test above is broken
7812c9
diff --git a/bin/update b/bin/update
7812c9
index 0ac5ffe..b584342 100755
7812c9
--- a/bin/update
7812c9
+++ b/bin/update
7812c9
@@ -452,7 +452,7 @@ def update_qfiles():
7812c9
         except EnvironmentError, e:
7812c9
             if e.errno <> errno.ENOTDIR:
7812c9
                 raise
7812c9
-            print _('Warning!  Not a directory: %(dirpath)s')
7812c9
+            print C_('Warning!  Not a directory: %(dirpath)s')
7812c9
 
7812c9
 
7812c9
 
7812c9
@@ -541,7 +541,7 @@ def dequeue(filebase):
7812c9
                 msg = data = None
7812c9
         except EOFError:
7812c9
             # For some reason the pckfile was empty.  Just delete it.
7812c9
-            print _('Warning!  Deleting empty .pck file: %(pckfile)s')
7812c9
+            print C_('Warning!  Deleting empty .pck file: %(pckfile)s')
7812c9
             os.unlink(pckfile)
7812c9
     finally:
7812c9
         if msgfp: