[r21489]GrampsLocale: Handle errors in getting collation key from locale module
svn: r21497
This commit is contained in:
parent
f309f210d1
commit
dede164e69
@ -527,6 +527,7 @@ class GrampsLocale(object):
|
||||
#ICU can digest strings and unicode
|
||||
return self.collator.getCollationKey(string).getByteArray()
|
||||
else:
|
||||
try:
|
||||
base_locale = locale.getlocale(locale.LC_COLLATE)
|
||||
locale.setlocale(locale.LC_COLLATE, self.collation)
|
||||
#locale in Python2 can't.
|
||||
@ -536,6 +537,11 @@ class GrampsLocale(object):
|
||||
key = locale.strxfrm(string)
|
||||
|
||||
locale.setlocale(locale.LC_COLLATE, base_locale)
|
||||
except Exception as err:
|
||||
LOG.warn("Failed to obtain key for %s because %s",
|
||||
self.collation, str(err))
|
||||
return string
|
||||
|
||||
return key
|
||||
|
||||
def strcoll(self, string1, string2):
|
||||
|
Loading…
Reference in New Issue
Block a user