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

Update QLocale::Country doc for new territories

Browse Source 
Neglected in 44b6757fe50b6bf581864d3da519a3ff60818fa8
Noted the need for this in a relevant script's instructions.

Change-Id: If69666f1799acebd434034c80b91056cb8777488
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2018-08-15 14:09:38 +02:00
parent bcf0be9b8f
commit 32f1bf0cac
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/tools/qlocale.qdoc
View File

@ -568,6 +568,7 @@
\value Estonia \value Estonia
\value Ethiopia \value Ethiopia
\value EuropeanUnion Since Qt 5.7 \value EuropeanUnion Since Qt 5.7
\value Europe Since Qt 5.12
\value FalklandIslands \value FalklandIslands
\value FaroeIslands \value FaroeIslands
\value Fiji \value Fiji
@ -619,6 +620,8 @@
\value Kuwait \value Kuwait
\value Kyrgyzstan \value Kyrgyzstan
\value Laos \value Laos
\value LatinAmerica
\value LatinAmericaAndTheCaribbean Obsolete, please use LatinAmerica
\value Latvia \value Latvia
\value Lebanon \value Lebanon
\value Lesotho \value Lesotho
@ -742,6 +745,7 @@
\value UnitedStatesVirginIslands \value UnitedStatesVirginIslands
\value WallisAndFutunaIslands \value WallisAndFutunaIslands
\value WesternSahara \value WesternSahara
\value World Since Qt 5.12
\value Yemen \value Yemen
\value Zambia \value Zambia
\value Zimbabwe \value Zimbabwe
@ -749,7 +753,6 @@
\value Serbia \value Serbia
\value SaintBarthelemy \value SaintBarthelemy
\value SaintMartin \value SaintMartin
\value LatinAmericaAndTheCaribbean
\value AscensionIsland \value AscensionIsland
\value AlandIslands \value AlandIslands
\value DiegoGarcia \value DiegoGarcia

7
util/local_database/cldr2qlocalexml.py
View File

@ -38,7 +38,12 @@ command-line argument. Save its standard output (but not error) to a
file for later processing by ``./qlocalexml2cpp.py`` file for later processing by ``./qlocalexml2cpp.py``
When you update the CLDR data, be sure to also update When you update the CLDR data, be sure to also update
src/corelib/tools/qt_attribution.json's entry for unicode-cldr. src/corelib/tools/qt_attribution.json's entry for unicode-cldr. Check
this script's output for unknown language, country or script messages;
if any can be resolved, use their entry in common/main/en.xml to
append new entries to enumdata.py's lists and update documentation in
src/corelib/tools/qlocale.qdoc, adding the new entries in alphabetic
order.
.. _CLDR: ftp://unicode.org/Public/cldr/ .. _CLDR: ftp://unicode.org/Public/cldr/
""" """