gnue/common/src GBaseApp.py

[Dmitry Sorokin]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Dmitry Sorokin <address@hidden> 03/01/19 05:01:38

Modified files:
        common/src     : GBaseApp.py 

Log message:
        i18n: gettext is initialized to support unicode, so one translation 
file would work for different target encodings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GBaseApp.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gnue/common/src/GBaseApp.py
diff -c gnue/common/src/GBaseApp.py:1.30 gnue/common/src/GBaseApp.py:1.31
*** gnue/common/src/GBaseApp.py:1.30    Wed Jan  1 19:45:41 2003
--- gnue/common/src/GBaseApp.py Sun Jan 19 05:01:38 2003
***************
*** 43,57 ****
  import locale
  
  locale.setlocale(locale.LC_ALL, '')
! try:
!   # 
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
!   # no need for LC_ALL on win2k and XP with this variant
!   lang = [locale.getdefaultlocale()[0]]
!   
gettext.translation('gnue',GConfig.getInstalledBase('install_prefix')+'/translations',languages=lang).install()
! except:
! #  sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')
!   import __builtin__
!   __builtin__.__dict__['_'] = lambda string:string
  
  
  import GDebug
--- 43,52 ----
  import locale
  
  locale.setlocale(locale.LC_ALL, '')
! 
! # Important for now _() to be defined here
! import __builtin__
! __builtin__.__dict__['_'] = lambda string:string
  
  
  import GDebug
***************
*** 226,231 ****
--- 221,252 ----
          p = string.strip(path)
          if not p in sys.path:
            sys.path.append(p)
+ 
+     try:
+       # 
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
+       # no need for LC_ALL on win2k and XP with this variant
+       lang = [locale.getdefaultlocale()[0]]
+       global catalog, runtime_charset 
+       catalog = 
gettext.translation('gnue',GConfig.getInstalledBase('install_prefix')+'/translations',languages=lang)
+       catalog.install(unicode=1)
+       runtime_charset = gConfig('formFontEncoding')
+       
+       if not catalog.charset():
+         raise InvalidFormatError, "Translation file is badly formatted for 
unicode operation"
+       
+       def translate(msg):
+         global catalog  
+         return catalog.ugettext(msg).encode(runtime_charset)
+     
+       import __builtin__  
+       __builtin__.__dict__['_'] = translate
+     except:
+       sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')
+       import __builtin__
+       __builtin__.__dict__['_'] = lambda string:string
+ 
+ 
+ 
  
      # Get the connection definitions
      if connections != None: