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

Update QLocale data to CLDRv23

Browse Source 
Say hello to Interlingua and Mongolian once again.

Change-Id: I735fbc5793f34620be1f6932a251224b9ded02e3
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-03-16 09:23:32 +02:00 committed by The Qt Project
parent 59b2a85654
commit f0af3ed4e5
6 changed files with 4284 additions and 4077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qlocale.h
View File

@ -511,9 +511,11 @@ public:
TaiVietScript = 100, TaiVietScript = 100,
TakriScript = 101, TakriScript = 101,
UgariticScript = 102, UgariticScript = 102,
BrailleScript = 103,
HiraganaScript = 104,
SimplifiedChineseScript = SimplifiedHanScript, SimplifiedChineseScript = SimplifiedHanScript,
TraditionalChineseScript = TraditionalHanScript, TraditionalChineseScript = TraditionalHanScript,
LastScript = UgariticScript LastScript = HiraganaScript
}; };
enum Country { enum Country {
AnyCountry = 0, AnyCountry = 0,

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

@ -92,7 +92,7 @@
\note For the current keyboard input locale take a look at \note For the current keyboard input locale take a look at
QInputMethod::locale(). QInputMethod::locale().
QLocale's data is based on Common Locale Data Repository v22.1. QLocale's data is based on Common Locale Data Repository v23.
The double-to-string and string-to-double conversion functions are The double-to-string and string-to-double conversion functions are
covered by the following licenses: covered by the following licenses:
@ -746,6 +746,7 @@
\value BengaliScript \value BengaliScript
\value BopomofoScript \value BopomofoScript
\value BrahmiScript \value BrahmiScript
\value BrailleScript
\value BugineseScript \value BugineseScript
\value BuhidScript \value BuhidScript
\value CanadianAboriginalScript \value CanadianAboriginalScript
@ -771,6 +772,7 @@
\value HangulScript \value HangulScript
\value HanunooScript \value HanunooScript
\value HebrewScript \value HebrewScript
\value HiraganaScript
\value ImperialAramaicScript \value ImperialAramaicScript
\value InscriptionalPahlaviScript \value InscriptionalPahlaviScript
\value InscriptionalParthianScript \value InscriptionalParthianScript

8342
src/corelib/tools/qlocale_data_p.h
View File

File diff suppressed because it is too large Load Diff

5
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -48,6 +48,7 @@
#include <QScopedArrayPointer> #include <QScopedArrayPointer>
#include <qtextcodec.h> #include <qtextcodec.h>
#include <qdatetime.h> #include <qdatetime.h>
#include <qprocess.h>
#include <float.h> #include <float.h>
#include <qlocale.h> #include <qlocale.h>
@ -1636,10 +1637,10 @@ void tst_QLocale::defaultNumeringSystem()
QCOMPARE(pa.toString(123), QLatin1String("123")); QCOMPARE(pa.toString(123), QLatin1String("123"));
QLocale ne("ne_IN"); QLocale ne("ne_IN");
QCOMPARE(ne.toString(123), QLatin1String("123")); QCOMPARE(ne.toString(123), QString::fromUtf8("१२३"));
QLocale mr("mr_IN"); QLocale mr("mr_IN");
QCOMPARE(mr.toString(123), QLatin1String("123")); QCOMPARE(mr.toString(123), QString::fromUtf8("१२३"));
QLocale ml("ml_IN"); QLocale ml("ml_IN");
QCOMPARE(ml.toString(123), QLatin1String("123")); QCOMPARE(ml.toString(123), QLatin1String("123"));

4
util/local_database/enumdata.py
View File

@ -722,7 +722,9 @@ script_list = {
99 : [ "Tai Le", "Tale" ], 99 : [ "Tai Le", "Tale" ],
100 : [ "Tai Viet", "Tavt" ], 100 : [ "Tai Viet", "Tavt" ],
101 : [ "Takri", "Takr" ], 101 : [ "Takri", "Takr" ],
102 : [ "Ugaritic", "Ugar" ] 102 : [ "Ugaritic", "Ugar" ],
103 : [ "Braille", "Brai" ],
104 : [ "Hiragana", "Hira" ]
# ### : [ "Blissymbols", "Blis" ], # ### : [ "Blissymbols", "Blis" ],
# ### : [ "Linear A", "Lina" ], # ### : [ "Linear A", "Lina" ],

2
util/local_database/qlocalexml2cpp.py
View File

@ -554,7 +554,7 @@ def main():
if to_language != 0: if to_language != 0:
cmnt_to = cmnt_to + language_map[to_language][1] cmnt_to = cmnt_to + language_map[to_language][1]
else: else:
cmnt_from = cmnt_from + "und" cmnt_to = cmnt_to + "und"
if to_script != 0: if to_script != 0:
if cmnt_to: if cmnt_to:
cmnt_to = cmnt_to + "_" cmnt_to = cmnt_to + "_"