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

[r21273] GrampsLocale: Directly set glocale attributes

Browse Source 
... in maclocale.mac_setup_localization()

svn: r21414
This commit is contained in:
John Ralls 2013-02-24 00:55:23 +00:00
parent db9daced3c
commit 7127f8f2da
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ class GrampsLocale(object):
if mac():
from . import maclocale
(self.lang, self.language) = maclocale.mac_setup_localization(self, lang, language)
maclocale.mac_setup_localization(self, lang, language)
else:
self.__init_from_environment(lang, language)

5
gramps/gen/utils/maclocale.py
View File

@ -200,7 +200,7 @@ def mac_setup_localization(glocale, lang, language):
if len(loc) > 2:
loc = loc[:2]
# First see if it matches lang
if (lang.startswith(loc)
if (lang and lang.startswith(loc)
and os.path.exists(os.path.join(locale_dir, lang[:5]))):
return lang[:5]
else:
@ -255,6 +255,7 @@ def mac_setup_localization(glocale, lang, language):
elif len(collation) > 0:
lang = mac_resolve_locale(collation)
glocale.lang = lang
if not language or len(language) == 0:
if "LANGUAGE" in os.environ:
@ -272,4 +273,4 @@ def mac_setup_localization(glocale, lang, language):
and not collation.startswith("en")):
language = [collation]
return (lang, language)
glocale.language = language