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

Merge John Ralls's 'bug11639' into maintenance/gramps51

Browse Source
This commit is contained in:
John Ralls 2020-04-08 13:09:17 -07:00
commit 823bcaac0d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/plugins/db/dbapi/sqlite.py
View File

@ -101,6 +101,7 @@ class Connection:
self.__cursor = self.__connection.cursor() self.__cursor = self.__connection.cursor()
self.__connection.create_function("regexp", 2, regexp) self.__connection.create_function("regexp", 2, regexp)
self.__collations = [] self.__collations = []
self.__tmap = str.maketrans('-.@=;', '_____')
self.check_collation(glocale) self.check_collation(glocale)
def check_collation(self, locale): def check_collation(self, locale):
@ -110,7 +111,10 @@ class Connection:
:param locale: Locale to be checked. :param locale: Locale to be checked.
:param type: A GrampsLocale object. :param type: A GrampsLocale object.
""" """
collation = locale.get_collation() #PySQlite3 permits only ascii alphanumerics and underscores in
#collation names so first translate any old-style Unicode locale
#delimiters to underscores.
collation = locale.get_collation().translate(self.__tmap)
if collation not in self.__collations: if collation not in self.__collations:
self.__connection.create_collation(collation, locale.strcoll) self.__connection.create_collation(collation, locale.strcoll)