diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-05-23 17:18:18 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-08 13:37:01 +0000 |
| commit | 72900b3d88dc326ace5b091d2ba8cea5ffb28a90 (patch) | |
| tree | 89eaaf4f7571a5e57cf9b2e5bd1fd11c6d18b886 /util | |
| parent | 99dd95f3c236bb48481199a1162bfefce3e31966 (diff) | |
Fix CLDR C++ generation to name "Han with Bopomofo" properly
We were using "Han With Bopomofo" (capitalized With) so that an enum
member in qlocale.h would be suitably camel-case; however, this lead
to spurious changes in qlocale_data_p.h where it names the script.
Use the correct (lower-case with) form and arrange for the enum
members to be generated with first letter of each word upper-case (but
not with each word capitalize()d; some words in there are already
camel-case, so .capitalize()ing would lower-case the later sub-words
in these).
Change-Id: I974c89dd40814eaf3bd538f06b9b4ebf17492f20
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'util')
| -rw-r--r-- | util/local_database/enumdata.py | 2 | ||||
| -rwxr-xr-x | util/local_database/qlocalexml2cpp.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py index aa2adfa52f..2d16e5851d 100644 --- a/util/local_database/enumdata.py +++ b/util/local_database/enumdata.py @@ -798,7 +798,7 @@ script_list = { 137 : [ "Newa", "Newa" ], 138 : [ "Osage", "Osge" ], 139 : [ "Tangut", "Tang" ], - 140 : [ "Han With Bopomofo", "Hanb" ], + 140 : [ "Han with Bopomofo", "Hanb" ], 141 : [ "Jamo", "Jamo" ] } diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py index 3a2db1580d..c63739e892 100755 --- a/util/local_database/qlocalexml2cpp.py +++ b/util/local_database/qlocalexml2cpp.py @@ -148,7 +148,8 @@ def loadLikelySubtagsMap(doc): return result def fixedScriptName(name, dupes): - name = name.replace(" ", "") + # Don't .capitalize() as some names are already camel-case (see enumdata.py): + name = ''.join(word[0].upper() + word[1:] for word in name.split()) if name[-6:] != "Script": name = name + "Script"; if name in dupes: |