gnue/common/src GBaseApp.py GParser.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/13 23:06:25

Modified files:
        common/src     : GBaseApp.py GParser.py 

Log message:
        Added btami's locale patches for better i18n support under win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GBaseApp.py.diff?cvsroot=OldCVS&tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GParser.py.diff?cvsroot=OldCVS&tr1=1.49&tr2=1.50&r1=text&r2=text

Patches:
Index: gnue/common/src/GBaseApp.py
diff -c gnue/common/src/GBaseApp.py:1.28 gnue/common/src/GBaseApp.py:1.29
*** gnue/common/src/GBaseApp.py:1.28    Sun Nov 10 17:06:33 2002
--- gnue/common/src/GBaseApp.py Wed Nov 13 23:06:25 2002
***************
*** 31,37 ****
  
  import GConfig
  #
! # i18n support
  #
  import getopt
  import sys
--- 31,37 ----
  
  import GConfig
  #
! # I18N, L10N support
  #
  import getopt
  import sys
***************
*** 40,48 ****
  import ConfigParser
  import gettext
  from gnue.common.TextUtils import lineWrap
  
  try:
!   
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
  except:
  #  sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')
    import __builtin__
--- 40,53 ----
  import ConfigParser
  import gettext
  from gnue.common.TextUtils import lineWrap
+ 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__
Index: gnue/common/src/GParser.py
diff -c gnue/common/src/GParser.py:1.49 gnue/common/src/GParser.py:1.50
*** gnue/common/src/GParser.py:1.49     Sun Nov 10 15:35:25 2002
--- gnue/common/src/GParser.py  Wed Nov 13 23:06:25 2002
***************
*** 235,241 ****
  
        for qattr in saxattrs.keys():
          attrns, attr = qattr
!         encoding = 'iso8859-1'  # TODO: fix this when we have [common] section
          try:                    #       in gnue.conf
            encoding = gConfig('formFontEncoding')
          except:
--- 235,243 ----
  
        for qattr in saxattrs.keys():
          attrns, attr = qattr
!         encoding= sys.getdefaultencoding()
!         if encoding == 'ascii':
!           encoding = 'iso8859-1'  # TODO: fix this when we have [common] 
section
          try:                    #       in gnue.conf
            encoding = gConfig('formFontEncoding')
          except: