Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4973: Gramps doesn't handle locale setting failure very well; testing (Tim's patch)

Browse Source 
svn: r18109
This commit is contained in:
Jérôme Rapinat 2011-09-03 15:44:06 +00:00
parent c3118790c9
commit 897e85aa51
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gramps.py
View File

@ -61,12 +61,23 @@ import constfunc
#TransUtils.setup_gettext() #TransUtils.setup_gettext()
gettext.bindtextdomain(TransUtils.LOCALEDOMAIN, TransUtils.LOCALEDIR) gettext.bindtextdomain(TransUtils.LOCALEDOMAIN, TransUtils.LOCALEDIR)
try: try:
locale.setlocale(locale.LC_ALL,'C')
locale.setlocale(locale.LC_ALL,'') locale.setlocale(locale.LC_ALL,'')
except locale.Error: except:
pass # FIXME: This should use LOG.warn, but logging has not been initialised yet
except ValueError: print >> sys.stderr, _("WARNING: Setting locale failed. Please fix the "
pass "LC_* and/or the LANG environment variables to prevent this error")
try:
# It is probably not necessary to set the locale to 'C'
# because the locale will just stay at whatever it was,
# which at startup is "C".
# however this is done here just to make sure that the locale
# functions are working
locale.setlocale(locale.LC_ALL,'C')
except:
print >> sys.stderr, _("ERROR: Setting the 'C' locale didn't work either")
# FIXME: This should propagate the exception,
# if that doesn't break Gramps under Windows
# raise
gettext.textdomain(TransUtils.LOCALEDOMAIN) gettext.textdomain(TransUtils.LOCALEDOMAIN)
gettext.install(TransUtils.LOCALEDOMAIN, localedir=None, unicode=1) #None is sys default locale gettext.install(TransUtils.LOCALEDOMAIN, localedir=None, unicode=1) #None is sys default locale
@ -80,9 +91,6 @@ if not constfunc.win():
else: else:
TransUtils.setup_windows_gettext() TransUtils.setup_windows_gettext()
LOG.debug('Using locale:', locale.getlocale())
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Minimum version check # Minimum version check
@ -340,6 +348,17 @@ def run():
argv_copy = sys.argv[:] argv_copy = sys.argv[:]
argpars = ArgParser(argv_copy) argpars = ArgParser(argv_copy)
# Calls to LOG must be after setup_logging() and ArgParser()
LOG = logging.getLogger(".locale")
LOG.debug('Using locale: LC_CTYPE: %s %s'% locale.getlocale(locale.LC_CTYPE))
LOG.debug('Using locale: LC_COLLATE: %s %s'% locale.getlocale(locale.LC_COLLATE))
LOG.debug('Using locale: LC_TIME %s %s'% locale.getlocale(locale.LC_TIME))
LOG.debug('Using locale: LC_MONETARY %s %s'% locale.getlocale(locale.LC_MONETARY))
LOG.debug('Using locale: LC_MESSAGES %s %s'% locale.getlocale(locale.LC_MESSAGES))
LOG.debug('Using locale: LC_NUMERIC %s %s'% locale.getlocale(locale.LC_NUMERIC))
LOG.debug('Using LANG: %s'% os.environ.get('LANG'))
LOG.debug('Using LANGUAGE: %s'% os.environ.get('LANGUAGE'))
if argpars.need_gui(): if argpars.need_gui():
#A GUI is needed, set it up #A GUI is needed, set it up
if "--qml" in sys.argv: if "--qml" in sys.argv: