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

[r21854]GrampsLocale: Win: Check both forward and reverse mslocale

Browse Source 
svn: r21857
This commit is contained in:
John Ralls 2013-04-02 20:35:51 +00:00
parent 0303212d49
commit 8fe756f5e4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,8 +174,7 @@ class GrampsLocale(object):
if not (hasattr(self, 'lang') and self.lang): if not (hasattr(self, 'lang') and self.lang):
self.lang = None self.lang = None
if 'LANG' in os.environ: if 'LANG' in os.environ:
lang = os.environ['LANG'] (lang, loc) = _check_mswin_locale(os.environ['LANG'])
(lang, loc) = _check_mswin_locale(lang)
if loc: if loc:
locale.setlocale(locale.LC_ALL, '.'.join(loc)) locale.setlocale(locale.LC_ALL, '.'.join(loc))
self.lang = lang self.lang = lang
@ -190,6 +189,10 @@ class GrampsLocale(object):
self.lang = loc[0] self.lang = loc[0]
self.languages = [loc[0]] self.languages = [loc[0]]
self.encoding = loc[1] self.encoding = loc[1]
elif ((lang, loc) = _check_mswin_locale(lang)):
self.lang = lang
self.language = [self.lang]
self.encoding = loc[1]
if not self.lang: if not self.lang:
self.lang = 'C' self.lang = 'C'