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

Fix processing of contractions, and changes to ensure code (after initial lines) for narrativeweb is the same for trunk and gramps34

Browse Source 
svn: r21294
This commit is contained in:
Tim G L Lyons 2013-02-04 18:49:57 +00:00
parent 7004ce9033
commit 7f10ab796e
2 changed files with 221 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Utils.py
View File

@ -277,6 +277,8 @@ def encodingdefs():
conv_unicode_tosrtkey_ongtk: convert a unicode object to sortkey usable conv_unicode_tosrtkey_ongtk: convert a unicode object to sortkey usable
string when gtk is loaded or utf-8 is default python encoding string when gtk is loaded or utf-8 is default python encoding
COLLATE_LANG: Language and sub-locale used for collation
""" """
pass pass
@ -288,21 +290,21 @@ try:
collation = os.environ["LANG"] collation = os.environ["LANG"]
language_and_country = collation.rsplit('.', 1)[0] language_and_country = collation.rsplit('.', 1)[0]
if language_and_country in PyICU.Collator.getAvailableLocales().keys(): if language_and_country in PyICU.Collator.getAvailableLocales().keys():
loc = language_and_country COLLATE_LANG = language_and_country
else: else:
language = collation.rsplit('_', 1)[0] language = collation.rsplit('_', 1)[0]
if language in PyICU.Collator.getAvailableLocales().keys(): if language in PyICU.Collator.getAvailableLocales().keys():
LOG.warn(_("Language and country %s not supported by ICU: " LOG.warn(_("Language and country %s not supported by ICU: "
"but language %s is supported and will be used" % "but language %s is supported and will be used" %
(language_and_country, language))) (language_and_country, language)))
loc = language COLLATE_LANG = language
else: else:
LOG.warn(_("Neither Language and country %s nor language %s " LOG.warn(_("Neither Language and country %s nor language %s "
"supported by ICU: using en_GB" % "supported by ICU: using en_GB" %
(language_and_country, language))) (language_and_country, language)))
loc = "en_GB" COLLATE_LANG = "en_GB"
collator = PyICU.Collator.createInstance(PyICU.Locale(loc)) collator = PyICU.Collator.createInstance(PyICU.Locale(COLLATE_LANG))
# on ICU, the functions need to receive unicode # on ICU, the functions need to receive unicode
conv_utf8_tosrtkey = lambda x: collator.getCollationKey( conv_utf8_tosrtkey = lambda x: collator.getCollationKey(
x.decode("UTF-8")).getByteArray() x.decode("UTF-8")).getByteArray()
@ -314,6 +316,7 @@ try:
x).getByteArray() x).getByteArray()
except: except:
LOG.warn(_("PyICU not available: sorting may be incorrect")) LOG.warn(_("PyICU not available: sorting may be incorrect"))
COLLATE_LANG = locale.getlocale()[0]
if constfunc.win(): if constfunc.win():
# python encoding is ascii, but C functions need to receive the # python encoding is ascii, but C functions need to receive the
# windows codeset, so convert over to it # windows codeset, so convert over to it

402
src/plugins/webreport/NarrativeWeb.py
View File

File diff suppressed because it is too large Load Diff