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

Update the internal CLDR tables up to v.24

Browse Source 
Change-Id: I9c0b110e36dd80c6a0b7275aa13bc548419aca9c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
This commit is contained in:
Konstantin Ritt 2014-01-12 11:45:56 +02:00 committed by The Qt Project
parent 9752cf7d13
commit 4f8f0f16d0
6 changed files with 4571 additions and 4376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,6 +390,9 @@ public:
TaiDam = 309, TaiDam = 309,
TaiNua = 310, TaiNua = 310,
Ugaritic = 311, Ugaritic = 311,
Akoose = 312,
Lakota = 313,
StandardMoroccanTamazight = 314,
Norwegian = NorwegianBokmal, Norwegian = NorwegianBokmal,
Moldavian = Romanian, Moldavian = Romanian,
SerboCroatian = Serbian, SerboCroatian = Serbian,
@ -404,7 +407,7 @@ public:
Chewa = Nyanja, Chewa = Nyanja,
Frisian = WesternFrisian, Frisian = WesternFrisian,
Uigur = Uighur, Uigur = Uighur,
LastLanguage = Ugaritic LastLanguage = StandardMoroccanTamazight
}; };
enum Script { enum Script {

5
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 v23.1. QLocale's data is based on Common Locale Data Repository v24.
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:
@ -130,6 +130,7 @@
\value Afan Obsolete, please use Oromo \value Afan Obsolete, please use Oromo
\value Afar \value Afar
\value Afrikaans \value Afrikaans
\value Akoose Since Qt 5.3
\value Albanian \value Albanian
\value Amharic \value Amharic
\value Arabic \value Arabic
@ -215,6 +216,7 @@
\value Rundi \value Rundi
\value Kurundi Obsolete, please use Rundi \value Kurundi Obsolete, please use Rundi
\value Kwanyama \value Kwanyama
\value Lakota Since Qt 5.3
\value Lao \value Lao
\value Latin \value Latin
\value Latvian \value Latvian
@ -272,6 +274,7 @@
\value Slovenian \value Slovenian
\value Somali \value Somali
\value Spanish \value Spanish
\value StandardMoroccanTamazight Since Qt 5.3
\value Sundanese \value Sundanese
\value Swahili \value Swahili
\value Swedish \value Swedish

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

File diff suppressed because it is too large Load Diff

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

@ -1172,9 +1172,9 @@ void tst_QLocale::formatDateTime_data()
QTest::newRow("5no_NO") << "no_NO" << QDateTime(QDate(1974, 1, 1), QTime(15, 14, 13)) QTest::newRow("5no_NO") << "no_NO" << QDateTime(QDate(1974, 1, 1), QTime(15, 14, 13))
<< "dd/MM/yyy z" << "01/01/74y 0"; << "dd/MM/yyy z" << "01/01/74y 0";
QTest::newRow("6no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) QTest::newRow("6no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13))
<< "ddd/MMM/yy AP" << "man./des./74 PM"; << "ddd/MMM/yy AP" << "man./des./74 P.M.";
QTest::newRow("7no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) QTest::newRow("7no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13))
<< "dddd/MMMM/y apa" << "mandag/desember/y pmpm"; << "dddd/MMMM/y apa" << "mandag/desember/y p.m.p.m.";
QTest::newRow("8no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) QTest::newRow("8no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13))
<< "ddddd/MMMMM/yy ss" << "mandag2/desember12/74 13"; << "ddddd/MMMMM/yy ss" << "mandag2/desember12/74 13";
QTest::newRow("9no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13)) QTest::newRow("9no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13))
@ -1864,8 +1864,8 @@ void tst_QLocale::ampm()
QCOMPARE(id.pmText(), QLatin1String("PM")); QCOMPARE(id.pmText(), QLatin1String("PM"));
QLocale ta("ta_LK"); QLocale ta("ta_LK");
QCOMPARE(ta.amText(), QLatin1String("AM")); QCOMPARE(ta.amText(), QString::fromUtf8("முற்பகல்"));
QCOMPARE(ta.pmText(), QLatin1String("PM")); QCOMPARE(ta.pmText(), QString::fromUtf8("பிற்பகல்"));
} }
void tst_QLocale::dateFormat() void tst_QLocale::dateFormat()
@ -1897,9 +1897,9 @@ void tst_QLocale::timeFormat()
QCOMPARE(c.timeFormat(QLocale::NarrowFormat), c.timeFormat(QLocale::ShortFormat)); QCOMPARE(c.timeFormat(QLocale::NarrowFormat), c.timeFormat(QLocale::ShortFormat));
const QLocale no("no_NO"); const QLocale no("no_NO");
QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH:mm")); QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH.mm"));
QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm")); QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm"));
QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("'kl'. HH:mm:ss t")); QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("HH.mm.ss t"));
const QLocale id("id_ID"); const QLocale id("id_ID");
QCOMPARE(id.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm")); QCOMPARE(id.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm"));
@ -1921,9 +1921,9 @@ void tst_QLocale::dateTimeFormat()
QCOMPARE(c.dateTimeFormat(QLocale::NarrowFormat), c.dateTimeFormat(QLocale::ShortFormat)); QCOMPARE(c.dateTimeFormat(QLocale::NarrowFormat), c.dateTimeFormat(QLocale::ShortFormat));
const QLocale no("no_NO"); const QLocale no("no_NO");
QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yy HH:mm")); QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yy HH.mm"));
QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yy HH:mm")); QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yy HH.mm"));
QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy 'kl'. HH:mm:ss t")); QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy HH.mm.ss t"));
} }
void tst_QLocale::monthName() void tst_QLocale::monthName()
@ -2001,9 +2001,9 @@ void tst_QLocale::currency()
const QLocale en_US("en_US"); const QLocale en_US("en_US");
QCOMPARE(en_US.toCurrencyString(qulonglong(1234)), QString("$1,234")); QCOMPARE(en_US.toCurrencyString(qulonglong(1234)), QString("$1,234"));
QCOMPARE(en_US.toCurrencyString(qlonglong(-1234)), QString("($1,234)")); QCOMPARE(en_US.toCurrencyString(qlonglong(-1234)), QString("$-1,234"));
QCOMPARE(en_US.toCurrencyString(double(1234.56)), QString("$1,234.56")); QCOMPARE(en_US.toCurrencyString(double(1234.56)), QString("$1,234.56"));
QCOMPARE(en_US.toCurrencyString(double(-1234.56)), QString("($1,234.56)")); QCOMPARE(en_US.toCurrencyString(double(-1234.56)), QString("$-1,234.56"));
const QLocale ru_RU("ru_RU"); const QLocale ru_RU("ru_RU");
QCOMPARE(ru_RU.toCurrencyString(qulonglong(1234)), QString::fromUtf8("1" "\xc2\xa0" "234\xc2\xa0\xd1\x80\xd1\x83\xd0\xb1.")); QCOMPARE(ru_RU.toCurrencyString(qulonglong(1234)), QString::fromUtf8("1" "\xc2\xa0" "234\xc2\xa0\xd1\x80\xd1\x83\xd0\xb1."));

18
util/local_database/cldr2qlocalexml.py
View File

@ -46,6 +46,7 @@ import enumdata
import xpathlite import xpathlite
from xpathlite import DraftResolution from xpathlite import DraftResolution
from dateconverter import convert_date from dateconverter import convert_date
from xml.sax.saxutils import escape, unescape
import re import re
findAlias = xpathlite.findAlias findAlias = xpathlite.findAlias
@ -94,11 +95,20 @@ def parse_list_pattern_part_format(pattern):
def ordStr(c): def ordStr(c):
if len(c) == 1: if len(c) == 1:
return str(ord(c)) return str(ord(c))
raise xpathlite.Error("Unable to handle value \"%s\"" % addEscapes(c))
return "##########" return "##########"
# the following functions are supposed to fix the problem with QLocale # the following functions are supposed to fix the problem with QLocale
# returning a character instead of strings for QLocale::exponential() # returning a character instead of strings for QLocale::exponential()
# and others. So we fallback to default values in these cases. # and others. So we fallback to default values in these cases.
def fixOrdStrMinus(c):
if len(c) == 1:
return str(ord(c))
return str(ord('-'))
def fixOrdStrPlus(c):
if len(c) == 1:
return str(ord(c))
return str(ord('+'))
def fixOrdStrExp(c): def fixOrdStrExp(c):
if len(c) == 1: if len(c) == 1:
return str(ord(c)) return str(ord(c))
@ -745,10 +755,10 @@ for key in locale_keys:
print " <locale>" print " <locale>"
print " <language>" + l['language'] + "</language>" print " <language>" + l['language'] + "</language>"
print " <languageEndonym>" + l['language_endonym'].encode('utf-8') + "</languageEndonym>" print " <languageEndonym>" + escape(l['language_endonym']).encode('utf-8') + "</languageEndonym>"
print " <script>" + l['script'] + "</script>" print " <script>" + l['script'] + "</script>"
print " <country>" + l['country'] + "</country>" print " <country>" + l['country'] + "</country>"
print " <countryEndonym>" + l['country_endonym'].encode('utf-8') + "</countryEndonym>" print " <countryEndonym>" + escape(l['country_endonym']).encode('utf-8') + "</countryEndonym>"
print " <languagecode>" + l['language_code'] + "</languagecode>" print " <languagecode>" + l['language_code'] + "</languagecode>"
print " <scriptcode>" + l['script_code'] + "</scriptcode>" print " <scriptcode>" + l['script_code'] + "</scriptcode>"
print " <countrycode>" + l['country_code'] + "</countrycode>" print " <countrycode>" + l['country_code'] + "</countrycode>"
@ -757,8 +767,8 @@ for key in locale_keys:
print " <list>" + fixOrdStrList(l['list']) + "</list>" print " <list>" + fixOrdStrList(l['list']) + "</list>"
print " <percent>" + fixOrdStrPercent(l['percent']) + "</percent>" print " <percent>" + fixOrdStrPercent(l['percent']) + "</percent>"
print " <zero>" + ordStr(l['zero']) + "</zero>" print " <zero>" + ordStr(l['zero']) + "</zero>"
print " <minus>" + ordStr(l['minus']) + "</minus>" print " <minus>" + fixOrdStrMinus(l['minus']) + "</minus>"
print " <plus>" + ordStr(l['plus']) + "</plus>" print " <plus>" + fixOrdStrPlus(l['plus']) + "</plus>"
print " <exp>" + fixOrdStrExp(l['exp']) + "</exp>" print " <exp>" + fixOrdStrExp(l['exp']) + "</exp>"
print " <quotationStart>" + l['quotationStart'].encode('utf-8') + "</quotationStart>" print " <quotationStart>" + l['quotationStart'].encode('utf-8') + "</quotationStart>"
print " <quotationEnd>" + l['quotationEnd'].encode('utf-8') + "</quotationEnd>" print " <quotationEnd>" + l['quotationEnd'].encode('utf-8') + "</quotationEnd>"

5
util/local_database/enumdata.py
View File

@ -356,7 +356,10 @@ language_list = {
308 : [ "Tagbanwa", "tbw" ], 308 : [ "Tagbanwa", "tbw" ],
309 : [ "TaiDam", "blt" ], 309 : [ "TaiDam", "blt" ],
310 : [ "TaiNua", "tdd" ], 310 : [ "TaiNua", "tdd" ],
311 : [ "Ugaritic", "uga" ] 311 : [ "Ugaritic", "uga" ],
312 : [ "Akoose", "bss" ],
313 : [ "Lakota", "lkt" ],
314 : [ "Standard Moroccan Tamazight", "zgh" ]
} }
country_list = { country_list = {