diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2023-08-01 12:23:49 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-04 10:30:05 +0000 |
| commit | 5221fbc4b0a06b096db34430a24c6e53ea50135a (patch) | |
| tree | f3792f04f0691d8f2687c6e070d06d5d8c906790 /util | |
| parent | a1ec66e7a320bd132b9d121316481b8868bd850f (diff) | |
Tweak lookup of en.xml names for languages, scripts and territories
Prefer stand-alone versions of the names when available. This saves
the need for a Han-specific kludge in the check for discrepancies
between our enum names and the en.xml names. Causes no change to
generated locale data.
Change-Id: I162f3107d6ffc1f8b893b206e0b78b61cf7254f6
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
(cherry picked from commit 40b063cd745136c1c0be4c9903955218ef647a02)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/locale_database/cldr.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/util/locale_database/cldr.py b/util/locale_database/cldr.py index c7409bcdb0..0bbdad39f9 100644 --- a/util/locale_database/cldr.py +++ b/util/locale_database/cldr.py @@ -356,7 +356,6 @@ class CldrAccess (object): def __checkEnum(given, proper, scraps, remap = { 'å': 'a', 'ã': 'a', 'ç': 'c', 'é': 'e', 'í': 'i', 'ü': 'u'}, prefix = { 'St.': 'Saint', 'U.S.': 'United States' }, - suffixes = ( 'Han', ), skip = '\u02bc'): # Each is a { code: full name } mapping for code, name in given.items(): @@ -376,8 +375,6 @@ class CldrAccess (object): try: f, t = ok.index('('), ok.index(')') except ValueError: break ok = ok[:f].rstrip() + ' ' + ok[t:].lstrip() - if any(name == ok + ' ' + s for s in suffixes): - continue if ''.join(ch for ch in name.lower() if not ch.isspace()) in ''.join( remap.get(ch, ch) for ch in ok.lower() if ch.isalpha() and ch not in skip): continue @@ -699,7 +696,13 @@ enumdata.py (keeping the old name as an alias): except (KeyError, ValueError, TypeError): pass else: - if key not in seen or 'alt' not in elt.attributes: + # Prefer stand-alone forms of names when present, ignore other + # alt="..." entries. For example, Traditional and Simplified + # Han omit "Han" in the plain form, but include it for + # stand-alone. As the stand-alone version appears later, it + # over-writes the plain one. + if (key not in seen or 'alt' not in elt.attributes + or elt.attributes['alt'].nodeValue == 'stand-alone'): yield key, value seen.add(key) |