[yum-git] callback.py cli.py output.py utils.py yumcommands.py yum/config.py yum/depsolve.py yum/i18n.py yum/__init__.py yummain.py yum/plugins.py yum/rpmtrans.py

[James Antill]

 callback.py     |    2 +-
 cli.py          |    2 +-
 output.py       |    2 +-
 utils.py        |    2 +-
 yum/__init__.py |    5 ++++-
 yum/config.py   |    1 +
 yum/depsolve.py |    2 +-
 yum/i18n.py     |   16 +++++++++-------
 yum/plugins.py  |    2 +-
 yum/rpmtrans.py |    2 +-
 yumcommands.py  |    2 +-
 yummain.py      |    4 ++--
 12 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit 259814b433c733430b0560f38d153aaa6038f633
Author: James Antill <james at and.org>
Date:   Fri Apr 11 11:02:01 2008 -0400

     Make i18n configurable ... all post to f-d-l that we've added choice!
    
     Always do the codecs magic thing, because that seems to help:
        sys.stdout.write(_('GPG key retrieval failed: '))
     ...in pl_PL.

diff --git a/callback.py b/callback.py
index e147b05..4d75a08 100644
--- a/callback.py
+++ b/callback.py
@@ -24,7 +24,7 @@ import sys
 import logging
 from yum.constants import *
 
-from yum.i18n import _
+import yum.i18n
 
 class RPMInstallCallback:
 
diff --git a/cli.py b/cli.py
index 125b09c..f4c044f 100644
--- a/cli.py
+++ b/cli.py
@@ -40,7 +40,7 @@ import rpmUtils.arch
 from rpmUtils.arch import isMultiLibArch
 import rpmUtils.miscutils
 from yum.packages import parsePackages, YumLocalPackage
-from yum.i18n import _
+import yum.i18n
 from yum.rpmtrans import RPMTransaction
 import signal
 import yumcommands
diff --git a/output.py b/output.py
index 061a1d4..4d835a8 100644
--- a/output.py
+++ b/output.py
@@ -23,7 +23,7 @@ import logging
 import types
 import gettext
 import rpm
-from yum.i18n import _
+import yum.i18n
 
 import re # For YumTerm
 
diff --git a/utils.py b/utils.py
index 9f5f4a1..82534cf 100644
--- a/utils.py
+++ b/utils.py
@@ -18,7 +18,7 @@ import time
 
 import yum
 from cli import *
-from yum.i18n import _
+import yum.i18n
 
 
 import yum.plugins as plugins
diff --git a/yum/__init__.py b/yum/__init__.py
index efd5a40..bef88cb 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -63,7 +63,7 @@ warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
 from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
 from constants import *
 from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
-from yum.i18n import _
+import yum.i18n
 from misc import to_unicode
 
 import string
@@ -176,6 +176,9 @@ class YumBase(depsolve.Depsolve):
                     startupconf.pluginconfpath,disabled_plugins)
 
         self._conf = config.readMainConfig(startupconf)
+        if self._conf.gaftonmode:
+            import __builtin__
+            __builtin__.__dict__['_'] = i18n.dummy_wrapper
 
         # run the postconfig plugin hook
         self.plugins.run('postconfig')
diff --git a/yum/config.py b/yum/config.py
index ea7c158..fecdfe3 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -570,6 +570,7 @@ class StartupConf(BaseConfig):
     plugins = BoolOption(False)
     pluginpath = ListOption(['/usr/share/yum-plugins', '/usr/lib/yum-plugins'])
     pluginconfpath = ListOption(['/etc/yum/pluginconf.d'])
+    gaftonmode = BoolOption(False)
 
 class YumConf(StartupConf):
     '''
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 8a707bd..2012a40 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -35,7 +35,7 @@ from constants import *
 import packages
 import logginglevels
 import Errors
-from i18n import _
+import i18n
 import warnings
 warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
 from operator import itemgetter
diff --git a/yum/i18n.py b/yum/i18n.py
index f735edd..84c4882 100644
--- a/yum/i18n.py
+++ b/yum/i18n.py
@@ -13,6 +13,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+def dummy_wrapper(str):
+    '''
+    Dummy Translation wrapper, just returning the same string.
+    '''
+    return str
+
 try: 
     '''
     Setup the yum translation domain and make _() translation wrapper
@@ -21,15 +27,11 @@ try:
     '''
     import gettext
     t = gettext.translation('yum')
-    _ =  t.ugettext
+    t.install(unicode=True)
 except:
     '''
     Something went wrong so we make a dummy _() wrapper there is just
     returning the same text
     '''
-    def _(str):
-        '''
-        Dummy Translation wrapper, just returning the same string.
-        '''
-        return str
-
+    import __builtin__
+    __builtin__.__dict__['_'] = dummy_wrapper
diff --git a/yum/plugins.py b/yum/plugins.py
index 0a7f57a..99c2740 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -31,7 +31,7 @@ import Errors
 from parser import ConfigPreProcessor
 
 from textwrap import fill
-from i18n import _
+import i18n
 
 import fnmatch
 
diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index d16af96..2fb51a2 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -24,7 +24,7 @@ import logging
 import types
 import sys
 from yum.constants import *
-from i18n import _
+import i18n
 
 
 class NoOutputCallBack:
diff --git a/yumcommands.py b/yumcommands.py
index 0afcf66..9dce44f 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -23,7 +23,7 @@ import os
 import cli
 from yum import logginglevels
 import yum.Errors
-from yum.i18n import _
+import yum.i18n
 
 import operator
 
diff --git a/yummain.py b/yummain.py
index 8fc518d..281fc91 100755
--- a/yummain.py
+++ b/yummain.py
@@ -27,13 +27,13 @@ import time # test purposes only
 from yum import Errors
 from yum import plugins
 from yum import logginglevels
-from yum.i18n import _ 
+import yum.i18n
 import cli
 
 
 def main(args):
     """This does all the real work"""
-    if not sys.stdout.isatty():
+    if True: # not sys.stdout.isatty():
         import codecs
         sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout)