1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update C Locale constructor to match others on ids and codes

Browse Source 
It was setting *_code='0' for the Any* forms of language, script and
territory; this is wrong, the codes for these are all empty or other
special tokens (like 'und', 'Zzzz', 'ZZ'). The IDs for them are zero,
as an int not a string, but were omitted. Also add the variant
details, for all that they're currently unused, for consistency.

This makes no difference to the generated data.

Task-number: QTBUG-115158
Change-Id: I339d1b201e50e2bbc510758ffbbaae0fa02277d4
Reviewed-by: Mate Barany <mate.barany@qt.io>
This commit is contained in:
Edward Welbourne 2024-04-26 16:42:29 +02:00
parent 0c809fc3b5
commit 69aefa4edf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/locale_database/qlocalexml.py
View File

@ -601,9 +601,12 @@ class Locale (object):
base[k] = ';'.join(x[:3] for x in base[k].split(';')) base[k] = ';'.join(x[:3] for x in base[k].split(';'))
return cls(base, return cls(base,
language='C', language_code='0', languageEndonym='', language='C', language_code='',
script='AnyScript', script_code='0', language_id=0, languageEndonym='',
territory='AnyTerritory', territory_code='0', territoryEndonym='', script='AnyScript', script_code='', script_id=0,
territory='AnyTerritory', territory_code='',
territory_id=0, territoryEndonym='',
variant='', variant_code='', variant_id=0,
# CLDR has non-ASCII versions of these: # CLDR has non-ASCII versions of these:
quotationStart='"', quotationEnd='"', quotationStart='"', quotationEnd='"',
alternateQuotationStart="'", alternateQuotationEnd="'", alternateQuotationStart="'", alternateQuotationEnd="'",