gnue common/src/GBaseApp.py common/src/GConfig....

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/05/06 22:27:04

Modified files:
        common/src     : GBaseApp.py GConfig.py GServerApp.py 
        common/src/FormatMasks: DateMask.py 
        designer/src   : Designer.py 
        forms/src      : GFClient.py 
Removed files:
        common/src     : GImport.py 

Log message:
        i18n changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GBaseApp.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConfig.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GServerApp.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/DateMask.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: gnue/common/src/FormatMasks/DateMask.py
diff -c gnue/common/src/FormatMasks/DateMask.py:1.21 
gnue/common/src/FormatMasks/DateMask.py:1.22
*** gnue/common/src/FormatMasks/DateMask.py:1.21        Mon May  6 14:51:31 2002
--- gnue/common/src/FormatMasks/DateMask.py     Mon May  6 22:27:04 2002
***************
*** 57,63 ****
  from gnue.common import GDebug
  from gnue.common.GDateTime import GDateTime, InvalidDate
  from FormatExceptions import *
- from gnue.common import GImport
  
  # TODO: This is obviously not Internationalized!
  # TODO (after some time...): will have to check whether it works...
--- 57,62 ----
Index: gnue/common/src/GBaseApp.py
diff -c gnue/common/src/GBaseApp.py:1.18 gnue/common/src/GBaseApp.py:1.19
*** gnue/common/src/GBaseApp.py:1.18    Sat May  4 12:45:07 2002
--- gnue/common/src/GBaseApp.py Mon May  6 22:27:04 2002
***************
*** 31,44 ****
  # HISTORY:
  #
  
! import GDebug
  import getopt
  import sys
  import string
  import os
- import GConnections
- import GConfig
  import ConfigParser
  
  class GBaseApp:
  
--- 31,57 ----
  # HISTORY:
  #
  
! import GConfig
! #
! # i18n support
! #
  import getopt
  import sys
  import string
  import os
  import ConfigParser
+ import gettext
+ 
+ try:
+   
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
+ except IOError:
+   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
+ import GConnections
  
  class GBaseApp:
  
***************
*** 66,82 ****
  
  
    def __init__(self, connections=None, application=None, defaults=None):
-     #
-     # i18n support
-     #
-     import gettext
- 
-     try:
-       
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
-     except IOError:
-       sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')    
-       import __builtin__
-       __builtin__.__dict__['_'] = lambda string:string
  
  
      # format of COMMAND_OPTIONS and _base_options:
--- 79,84 ----
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.21 gnue/common/src/GConfig.py:1.22
*** gnue/common/src/GConfig.py:1.21     Mon May  6 21:13:49 2002
--- gnue/common/src/GConfig.py  Mon May  6 22:27:04 2002
***************
*** 94,108 ****
      if not configFilename: configFilename = self._defaultConfigFilename
      if not section: section = self._defaultSection
  
! #    try:
      try:
        return self._loadedConfigs[configFilename].get(section,varName)
      except NoSectionError:
        self._loadedConfigs[configFilename].add_section(section)
        return self._loadedConfigs[configFilename].get(section,varName)
! #    except NoOptionError:
! #      return self._loadedConfigs[configFilename].get('DEFAULT',varName)
!       
  
    def gConfigDict(self, configFilename=None, section=None):
      if not configFilename: configFilename = self._defaultConfigFilename
--- 94,112 ----
      if not configFilename: configFilename = self._defaultConfigFilename
      if not section: section = self._defaultSection
  
!     #try:
!     #  print self._loadedConfigs[configFilename].options('forms')
!     #except:
!     #  pass
! 
!     #try:
      try:
        return self._loadedConfigs[configFilename].get(section,varName)
      except NoSectionError:
        self._loadedConfigs[configFilename].add_section(section)
        return self._loadedConfigs[configFilename].get(section,varName)
!     #except NoOptionError:
!     #    return self._loadedConfigs[configFilename].get('DEFAULT',varName)
  
    def gConfigDict(self, configFilename=None, section=None):
      if not configFilename: configFilename = self._defaultConfigFilename
Index: gnue/common/src/GServerApp.py
diff -c gnue/common/src/GServerApp.py:1.8 gnue/common/src/GServerApp.py:1.9
*** gnue/common/src/GServerApp.py:1.8   Sun May  5 19:38:27 2002
--- gnue/common/src/GServerApp.py       Mon May  6 22:27:04 2002
***************
*** 40,56 ****
  class GServerApp(GBaseApp):
  
    def __init__(self, connections=None, application=None):
!     #
!     # i18n support
!     #
!     import gettext
  
!     try:
!       
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
!     except IOError:
!       sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')    
!       import __builtin__
!       __builtin__.__dict__['_'] = lambda string:string
  
      self.COMMAND_OPTIONS.append (
        [ 'foreground','Z','no-detach',0,0, None,
--- 40,56 ----
  class GServerApp(GBaseApp):
  
    def __init__(self, connections=None, application=None):
! ##     #
! ##     # i18n support
! ##     #
! ##     import gettext
  
! ##     try:
! ##       
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
! ##     except IOError:
! ##       sys.stderr.write('Unable to load locale information falling back to 
default English language translations.\n')    
! ##       import __builtin__
! ##       __builtin__.__dict__['_'] = lambda string:string
  
      self.COMMAND_OPTIONS.append (
        [ 'foreground','Z','no-detach',0,0, None,
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.37 gnue/designer/src/Designer.py:1.38
*** gnue/designer/src/Designer.py:1.37  Sat May  4 12:45:08 2002
--- gnue/designer/src/Designer.py       Mon May  6 22:27:04 2002
***************
*** 59,69 ****
  
  from StringIO import StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, dyn_import
  from gnue.designer import VERSION, PACKAGE
  from ToolSupport import SupportedTools
  import TemplateParser, TemplateChooser, MRUManager
- from gnue.common.GClientApp import GClientApp
  from gnue.forms.GFConfig import ConfigOptions
  from Config import ConfigOptions as DesignerConfigOptions
  
--- 59,69 ----
  
  from StringIO import StringIO
  from wxPython.wx import *
+ from gnue.common.GClientApp import GClientApp
  from gnue.common import GDebug, dyn_import
  from gnue.designer import VERSION, PACKAGE
  from ToolSupport import SupportedTools
  import TemplateParser, TemplateChooser, MRUManager
  from gnue.forms.GFConfig import ConfigOptions
  from Config import ConfigOptions as DesignerConfigOptions
  
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.39 gnue/forms/src/GFClient.py:1.40
*** gnue/forms/src/GFClient.py:1.39     Sat May  4 12:45:08 2002
--- gnue/forms/src/GFClient.py  Mon May  6 22:27:04 2002
***************
*** 36,48 ****
  import sys
  import urllib
  
  from gnue.forms.GFInstance import *
  from gnue.forms.GFForm import *
  from gnue.forms.GFParser import loadForm
  from gnue.forms import GFKeyMapper
  from gnue.common import GDebug
  from gnue.common import GConfig, GDataObjects, GConnections, dyn_import
- from gnue.common.GClientApp import *
  from gnue.forms import VERSION
  from gnue.forms.GFConfig import ConfigOptions
  
--- 36,48 ----
  import sys
  import urllib
  
+ from gnue.common.GClientApp import *
  from gnue.forms.GFInstance import *
  from gnue.forms.GFForm import *
  from gnue.forms.GFParser import loadForm
  from gnue.forms import GFKeyMapper
  from gnue.common import GDebug
  from gnue.common import GConfig, GDataObjects, GConnections, dyn_import
  from gnue.forms import VERSION
  from gnue.forms.GFConfig import ConfigOptions
  
***************
*** 75,82 ****
  
      self.ui_type = self.OPTIONS['user_interface']
  
-     print "Config", gConfig
-     
      if gConfig('disableSplash') == '1': 
        self.disableSplash = 1
      else:
--- 75,80 ----