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

[r21881]GrampsLocale: Ensure posix collation and calendar

Browse Source 
are set correctly

svn: r21884
This commit is contained in:
John Ralls 2013-04-04 21:18:22 +00:00
parent 496cf30d6b
commit 5fc65f68ea
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,8 +275,21 @@ class GrampsLocale(object):
if language: if language:
self.language = language self.language = language
self.calendar = locale.getlocale(locale.LC_TIME)[0] or self.lang if HAVE_ICU:
self.collation = locale.getlocale(locale.LC_COLLATE)[0] or self.lang self.calendar = locale.getlocale(locale.LC_TIME)[0] or self.lang[:5]
self.collation = locale.getlocale(locale.LC_COLLATE)[0] or self.lang[:5]
else:
loc = locale.getlocale(locale.LC_TIME)
if loc and loc[0]:
self.calendar = '.'.join(loc)
else:
self.calendar = self.lang
loc = locale.getlocale(locale.LC_COLLATE)
if loc and loc[0]:
self.collation = '.'.join(loc)
else:
self.collation = self.lang
def _win_bindtextdomain(self, localedomain, localedir): def _win_bindtextdomain(self, localedomain, localedir):
""" """
@ -753,18 +766,26 @@ class GrampsLocale(object):
try: try:
base_locale = locale.getlocale(locale.LC_COLLATE) base_locale = locale.getlocale(locale.LC_COLLATE)
locale.setlocale(locale.LC_COLLATE, self.collation) locale.setlocale(locale.LC_COLLATE, self.collation)
except Exception as err:
LOG.warn("Failed to set temporary locale with %s: %s",
self.lang, err)
return string
#locale in Python2 can't. #locale in Python2 can't.
try:
if sys.version_info[0] < 3 and isinstance(string, unicode): if sys.version_info[0] < 3 and isinstance(string, unicode):
key = locale.strxfrm(string.encode("utf-8", "replace")) key = locale.strxfrm(string.encode("utf-8", "replace"))
else: else:
key = locale.strxfrm(string) key = locale.strxfrm(string)
locale.setlocale(locale.LC_COLLATE, base_locale)
except Exception as err: except Exception as err:
LOG.warn("Failed to obtain key for %s because %s", LOG.warn("Failed to obtain key for %s because %s",
self.collation, str(err)) self.collation, str(err))
return string return string
try:
locale.setlocale(locale.LC_COLLATE, base_locale)
except Exception as err:
LOG.warn("Failed to restore locale %s", err)
return key
return key return key
def strcoll(self, string1, string2): def strcoll(self, string1, string2):