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

GrampsLocale: Posix: Move LC_MESSAGES check to setting self.language

Browse Source 
svn: r22035
This commit is contained in:
John Ralls 2013-04-20 23:09:51 +00:00
parent 1832f7bdb5
commit a2e17b7b4a
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gramps/gen/utils/grampslocale.py
View File

@ -281,14 +281,13 @@ class GrampsLocale(object):
_failure = False _failure = False
try: try:
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
if not _check_locale(locale.getlocale(locale.LC_MESSAGES)): if not _check_locale(locale.getlocale()):
if not _check_locale(locale.getlocale()): if not _check_locale(locale.getdefaultlocale()):
if not _check_locale(locale.getdefaultlocale()): LOG.debug("Usable locale not found, localization settings ignored.");
LOG.debug("Usable locale not found, localization settings ignored."); self.lang = 'C'
self.lang = 'C' self.encoding = 'ascii'
self.encoding = 'ascii' self.language = ['en']
self.language = ['en'] _failure = True
_failure = True
except locale.Error as err: except locale.Error as err:
LOG.debug("Locale error %s, localization settings ignored.", LOG.debug("Locale error %s, localization settings ignored.",
@ -298,6 +297,15 @@ class GrampsLocale(object):
self.language = ['en'] self.language = ['en']
_failure = True _failure = True
#LC_MESSAGES
(loc, enc) = locale.getlocale(locale.LC_MESSAGES)
if loc:
language = self.check_available_translations(loc)
if language:
self.language = [language]
else:
LOG.debug("No translation for LC_MESSAGES locale %s", loc)
# $LANGUAGE overrides $LANG, $LC_MESSAGES # $LANGUAGE overrides $LANG, $LC_MESSAGES
if "LANGUAGE" in os.environ: if "LANGUAGE" in os.environ:
language = [x for x in [self.check_available_translations(l) language = [x for x in [self.check_available_translations(l)
@ -307,8 +315,6 @@ class GrampsLocale(object):
self.language = language self.language = language
if not self.lang.startswith(self.language[0]): if not self.lang.startswith(self.language[0]):
LOG.debug("Overiding locale setting %s with LANGUAGE setting %s", self.lang, self.language[0]) LOG.debug("Overiding locale setting %s with LANGUAGE setting %s", self.lang, self.language[0])
self.lang = locale.normalize(self.language[0])
self.encoding = self.lang.split('.')[1]
elif _failure: elif _failure:
LOG.warning("No valid locale settings found, using US English") LOG.warning("No valid locale settings found, using US English")
@ -317,7 +323,7 @@ class GrampsLocale(object):
self.collation = locale.getlocale(locale.LC_COLLATE)[0] or self.lang[:5] self.collation = locale.getlocale(locale.LC_COLLATE)[0] or self.lang[:5]
else: else:
loc = locale.getlocale(locale.LC_TIME) loc = locale.getlocale(locale.LC_TIME)
if loc and loc[0]: if loc and self.check_available_translations(loc[0]):
self.calendar = '.'.join(loc) self.calendar = '.'.join(loc)
else: else:
self.calendar = self.lang self.calendar = self.lang
@ -430,7 +436,7 @@ class GrampsLocale(object):
if len(check_lang) < 2 or check_lang[1] not in ("utf-8", "UTF-8"): if len(check_lang) < 2 or check_lang[1] not in ("utf-8", "UTF-8"):
lang = '.'.join((check_lang[0], 'UTF-8')) lang = '.'.join((check_lang[0], 'UTF-8'))
os.environ["LANG"] = self.lang os.environ["LANG"] = lang
os.environ["LANGUAGE"] = ':'.join(['C' if l in ('en', 'en_US') else l os.environ["LANGUAGE"] = ':'.join(['C' if l in ('en', 'en_US') else l
for l in self.language]) for l in self.language])