update tables data to CLDR v39

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-01 21:17:15 +03:00
parent 6297158d21
commit 869bf6596a
6 changed files with 259 additions and 263 deletions

2
README
View file

@ -21,7 +21,7 @@ There are several things you should be aware before considering Katie:
- versioned and extended classes have been merged into the base class,
e.g. QIconEngineV2 into QIconEngine and QKeyEventEx into QKeyEvent
- QGuiPlatformPlugin class is public
- updated localizations data from Common Locale Data Repository v38
- updated localizations data from Common Locale Data Repository v39
- SQLite driver uses UTF-8 encoding instead of UTF-16
- default text codec for C-strings is UTF-8
- QTranslator uses gettext for translations

View file

@ -2,7 +2,7 @@
#-*- coding: UTF-8 -*-
# See https://github.com/fluxer/katie/wiki/Unicode-support
# Data is from https://unicode.org/Public/cldr/38/core.zip
# Data is from https://unicode.org/Public/cldr/39/core.zip
import os, sys, glob, re
import xml.etree.ElementTree as ET

View file

@ -581,169 +581,168 @@ public:
Romansh = 456,
Romany = 457,
Rombo = 458,
Root = 459,
Rotuman = 460,
Roviana = 461,
Rundi = 462,
Russian = 463,
Rusyn = 464,
Rwa = 465,
Saho = 466,
Sakha = 467,
SamaritanAramaic = 468,
Samburu = 469,
Samoan = 470,
Samogitian = 471,
Sandawe = 472,
Sango = 473,
Sangu = 474,
Sanskrit = 475,
Santali = 476,
Sardinian = 477,
Sasak = 478,
SassareseSardinian = 479,
SaterlandFrisian = 480,
Saurashtra = 481,
Scots = 482,
ScottishGaelic = 483,
Selayar = 484,
Selkup = 485,
Sena = 486,
Seneca = 487,
Serbian = 488,
SerboCroatian = 489,
Serer = 490,
Seri = 491,
SeselwaCreoleFrench = 492,
Shambala = 493,
Shan = 494,
Shona = 495,
SichuanYi = 496,
Sicilian = 497,
Sidamo = 498,
Siksika = 499,
Silesian = 500,
SimplifiedChinese = 501,
Sindhi = 502,
Sinhala = 503,
SkoltSami = 504,
Slave = 505,
Slovak = 506,
Slovenian = 507,
Soga = 508,
Sogdien = 509,
Somali = 510,
Soninke = 511,
SouthNdebele = 512,
SouthernAltai = 513,
SouthernKurdish = 514,
SouthernSami = 515,
SouthernSotho = 516,
Spanish = 517,
SrananTongo = 518,
StandardMoroccanTamazight = 519,
Sukuma = 520,
Sumerian = 521,
Sundanese = 522,
Susu = 523,
Swahili = 524,
Swati = 525,
Swedish = 526,
SwissFrench = 527,
SwissGerman = 528,
SwissHighGerman = 529,
Syriac = 530,
Tachelhit = 531,
Tagalog = 532,
Tahitian = 533,
Taita = 534,
Tajik = 535,
Talysh = 536,
Tamashek = 537,
Tamil = 538,
Taroko = 539,
Tasawaq = 540,
Tatar = 541,
Telugu = 542,
Tereno = 543,
Teso = 544,
Tetum = 545,
Thai = 546,
Tibetan = 547,
Tigre = 548,
Tigrinya = 549,
Timne = 550,
Tiv = 551,
Tlingit = 552,
TokPisin = 553,
TokelauLanguage = 554,
Tongan = 555,
TornedalenFinnish = 556,
TraditionalChinese = 557,
Tsakhur = 558,
Tsakonian = 559,
Tsimshian = 560,
Tsonga = 561,
Tswana = 562,
Tulu = 563,
Tumbuka = 564,
TunisianArabic = 565,
Turkish = 566,
Turkmen = 567,
Turoyo = 568,
TuvaluLanguage = 569,
Tuvinian = 570,
Twi = 571,
Tyap = 572,
Udmurt = 573,
Ugaritic = 574,
Uighur = 575,
Ukrainian = 576,
Umbundu = 577,
Unknownlanguage = 578,
UpperSorbian = 579,
Urdu = 580,
Uzbek = 581,
Vai = 582,
Venda = 583,
Venetian = 584,
Veps = 585,
Vietnamese = 586,
Volapuk = 587,
Voro = 588,
Votic = 589,
Vunjo = 590,
Walloon = 591,
Walser = 592,
Waray = 593,
Warlpiri = 594,
Washo = 595,
Wayuu = 596,
Welsh = 597,
WestFlemish = 598,
WesternBalochi = 599,
WesternFrisian = 600,
WesternMari = 601,
Wolaytta = 602,
Wolof = 603,
WuChinese = 604,
Xhosa = 605,
XiangChinese = 606,
Yangben = 607,
Yao = 608,
Yapese = 609,
Yemba = 610,
Yiddish = 611,
Yoruba = 612,
Zapotec = 613,
Zarma = 614,
Zaza = 615,
Zeelandic = 616,
Zenaga = 617,
Zhuang = 618,
ZoroastrianDari = 619,
Zulu = 620,
Zuni = 621,
Rotuman = 459,
Roviana = 460,
Rundi = 461,
Russian = 462,
Rusyn = 463,
Rwa = 464,
Saho = 465,
Sakha = 466,
SamaritanAramaic = 467,
Samburu = 468,
Samoan = 469,
Samogitian = 470,
Sandawe = 471,
Sango = 472,
Sangu = 473,
Sanskrit = 474,
Santali = 475,
Sardinian = 476,
Sasak = 477,
SassareseSardinian = 478,
SaterlandFrisian = 479,
Saurashtra = 480,
Scots = 481,
ScottishGaelic = 482,
Selayar = 483,
Selkup = 484,
Sena = 485,
Seneca = 486,
Serbian = 487,
SerboCroatian = 488,
Serer = 489,
Seri = 490,
SeselwaCreoleFrench = 491,
Shambala = 492,
Shan = 493,
Shona = 494,
SichuanYi = 495,
Sicilian = 496,
Sidamo = 497,
Siksika = 498,
Silesian = 499,
SimplifiedChinese = 500,
Sindhi = 501,
Sinhala = 502,
SkoltSami = 503,
Slave = 504,
Slovak = 505,
Slovenian = 506,
Soga = 507,
Sogdien = 508,
Somali = 509,
Soninke = 510,
SouthNdebele = 511,
SouthernAltai = 512,
SouthernKurdish = 513,
SouthernSami = 514,
SouthernSotho = 515,
Spanish = 516,
SrananTongo = 517,
StandardMoroccanTamazight = 518,
Sukuma = 519,
Sumerian = 520,
Sundanese = 521,
Susu = 522,
Swahili = 523,
Swati = 524,
Swedish = 525,
SwissFrench = 526,
SwissGerman = 527,
SwissHighGerman = 528,
Syriac = 529,
Tachelhit = 530,
Tagalog = 531,
Tahitian = 532,
Taita = 533,
Tajik = 534,
Talysh = 535,
Tamashek = 536,
Tamil = 537,
Taroko = 538,
Tasawaq = 539,
Tatar = 540,
Telugu = 541,
Tereno = 542,
Teso = 543,
Tetum = 544,
Thai = 545,
Tibetan = 546,
Tigre = 547,
Tigrinya = 548,
Timne = 549,
Tiv = 550,
Tlingit = 551,
TokPisin = 552,
TokelauLanguage = 553,
Tongan = 554,
TornedalenFinnish = 555,
TraditionalChinese = 556,
Tsakhur = 557,
Tsakonian = 558,
Tsimshian = 559,
Tsonga = 560,
Tswana = 561,
Tulu = 562,
Tumbuka = 563,
TunisianArabic = 564,
Turkish = 565,
Turkmen = 566,
Turoyo = 567,
TuvaluLanguage = 568,
Tuvinian = 569,
Twi = 570,
Tyap = 571,
Udmurt = 572,
Ugaritic = 573,
Uighur = 574,
Ukrainian = 575,
Umbundu = 576,
Unknownlanguage = 577,
UpperSorbian = 578,
Urdu = 579,
Uzbek = 580,
Vai = 581,
Venda = 582,
Venetian = 583,
Veps = 584,
Vietnamese = 585,
Volapuk = 586,
Voro = 587,
Votic = 588,
Vunjo = 589,
Walloon = 590,
Walser = 591,
Waray = 592,
Warlpiri = 593,
Washo = 594,
Wayuu = 595,
Welsh = 596,
WestFlemish = 597,
WesternBalochi = 598,
WesternFrisian = 599,
WesternMari = 600,
Wolaytta = 601,
Wolof = 602,
WuChinese = 603,
Xhosa = 604,
XiangChinese = 605,
Yangben = 606,
Yao = 607,
Yapese = 608,
Yemba = 609,
Yiddish = 610,
Yoruba = 611,
Zapotec = 612,
Zarma = 613,
Zaza = 614,
Zeelandic = 615,
Zenaga = 616,
Zhuang = 617,
ZoroastrianDari = 618,
Zulu = 619,
Zuni = 620,
Azeri = Azerbaijani,
ChineseCantonese = Cantonese,
@ -1056,10 +1055,10 @@ public:
WesternAsia = 288,
WesternEurope = 289,
WesternSahara = 290,
World = 291,
Yemen = 292,
Zambia = 293,
Zimbabwe = 294,
Yemen = 291,
Zambia = 292,
Zimbabwe = 293,
world = 294,
BosniaAndHerzegovina = Bosnia,
CapeVerde = CaboVerde,
@ -1078,7 +1077,7 @@ public:
UnitedNations = UN,
UnitedStates = US,
LastCountry = Zimbabwe
LastCountry = world
};
enum Script {

View file

@ -83,7 +83,7 @@
\note For the current keyboard input locale take a look at
QApplication::keyboardInputLocale().
QLocale's data is based on Common Locale Data Repository v38.
QLocale's data is based on Common Locale Data Repository v39.
The double-to-string and string-to-double conversion functions are
covered by the following licenses:
@ -588,7 +588,6 @@
\value Romansh
\value Romany
\value Rombo
\value Root
\value Rotuman
\value Roviana
\value Rundi
@ -1073,10 +1072,10 @@
\value WesternAsia
\value WesternEurope
\value WesternSahara
\value World
\value Yemen
\value Zambia
\value Zimbabwe
\value world
\omitvalue LastCountry
\sa country(), countryToString()

View file

@ -509,7 +509,6 @@ static const struct languageTblData {
{ QLocale::Language::Romansh, "Romansh\0", "rm\0" },
{ QLocale::Language::Romany, "Romany\0", "rom\0" },
{ QLocale::Language::Rombo, "Rombo\0", "rof\0" },
{ QLocale::Language::Root, "Root\0", "root\0" },
{ QLocale::Language::Rotuman, "Rotuman\0", "rtm\0" },
{ QLocale::Language::Roviana, "Roviana\0", "rug\0" },
{ QLocale::Language::Rundi, "Rundi\0", "rn\0" },
@ -971,10 +970,10 @@ static const struct countryTblData {
{ QLocale::Country::WesternAsia, "Western Asia\0", "145\0" },
{ QLocale::Country::WesternEurope, "Western Europe\0", "155\0" },
{ QLocale::Country::WesternSahara, "Western Sahara\0", "EH\0" },
{ QLocale::Country::World, "World\0", "001\0" },
{ QLocale::Country::Yemen, "Yemen\0", "YE\0" },
{ QLocale::Country::Zambia, "Zambia\0", "ZM\0" },
{ QLocale::Country::Zimbabwe, "Zimbabwe\0", "ZW\0" },
{ QLocale::Country::world, "world\0", "001\0" },
};
static const qint16 countryTblSize = sizeof(countryTbl) / sizeof(countryTblData);
@ -1320,7 +1319,7 @@ static const QLocalePrivate localeTbl[] = {
{ "\0", "\0", "\0", "\0", "\0", "\0", "\0" }
}, // am_ET
{
QLocale::Language::Arabic, QLocale::Script::AnyScript, QLocale::Country::World,
QLocale::Language::Arabic, QLocale::Script::AnyScript, QLocale::Country::world,
Qt::Monday, Qt::Saturday, Qt::Sunday,
1643, 1644, 1563, 37, 45, 43, 69, 2, 1632,
8221, 8220, 8217, 8216,
@ -3206,11 +3205,11 @@ static const QLocalePrivate localeTbl[] = {
{ "Δ\0", "Τ\0", "Τ\0", "Π\0", "Π\0", "Σ\0", "Κ\0" }
}, // el_GR
{
QLocale::Language::English, QLocale::Script::AnyScript, QLocale::Country::World,
QLocale::Language::English, QLocale::Script::AnyScript, QLocale::Country::world,
Qt::Monday, Qt::Saturday, Qt::Sunday,
46, 44, 59, 37, 45, 43, 69, 2, 48,
8220, 8221, 8216, 8217,
"English\0", "World\0",
"English\0", "world\0",
"%1, %2\0", "%1, %2\0", "%1 and %2\0", "%1 and %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "h:mm AP\0", "h:mm:ss AP t\0",
"am\0", "pm\0",
@ -5621,7 +5620,7 @@ static const QLocalePrivate localeTbl[] = {
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0" }
}, // en_ZW
{
QLocale::Language::Esperanto, QLocale::Script::LatinScript, QLocale::Country::World,
QLocale::Language::Esperanto, QLocale::Script::LatinScript, QLocale::Country::world,
Qt::Monday, Qt::Saturday, Qt::Sunday,
44, 160, 59, 37, 8722, 43, 69, 2, 48,
8220, 8221, 8216, 8217,
@ -7078,7 +7077,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -7124,7 +7123,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -7285,7 +7284,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -7676,7 +7675,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "yyyy MMMM d\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
@ -7791,7 +7790,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -7929,7 +7928,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "yyyy MMMM d\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
@ -7998,7 +7997,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 et %2\0", "%1 et %2\0",
"dd/MM/yyyy\0", "d MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
"FCFA\0", "%1 %2\0", Q_NULLPTR, "XOF\0", "franc CFA (BCEAO)\0",
{ "janv.\0", "févr.\0", "mars\0", "avr.\0", "mai\0", "juin\0", "juil.\0", "août\0", "sept.\0", "oct.\0", "nov.\0", "déc.\0" },
{ "janvier\0", "février\0", "mars\0", "avril\0", "mai\0", "juin\0", "juillet\0", "août\0", "septembre\0", "octobre\0", "novembre\0", "décembre\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -8634,7 +8633,7 @@ static const QLocalePrivate localeTbl[] = {
{ "Ե\0", "Ե\0", "Չ\0", "Հ\0", "Ո\0", "Շ\0", "Կ\0" }
}, // hy_AM
{
QLocale::Language::Interlingua, QLocale::Script::AnyScript, QLocale::Country::World,
QLocale::Language::Interlingua, QLocale::Script::AnyScript, QLocale::Country::world,
Qt::Monday, Qt::Saturday, Qt::Sunday,
44, 46, 59, 37, 45, 43, 69, 2, 48,
8216, 8217, 8220, 8221,
@ -10361,48 +10360,48 @@ static const QLocalePrivate localeTbl[] = {
{
QLocale::Language::NorwegianBokmal, QLocale::Script::LatinScript, QLocale::Country::Norway,
Qt::Monday, Qt::Saturday, Qt::Sunday,
44, 160, 59, 37, 8722, 43, 69, 2, 48,
171, 187, 8216, 8217,
"norsk bokmål\0", "Norge\0",
"%1, %2\0", "%1, %2\0", "%1 og %2\0", "%1 og %2\0",
"dd.MM.yyyy\0", "d. MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"a.m.\0", "p.m.\0",
"kr\0", "%2 %1\0", Q_NULLPTR, "NOK\0", "norske kroner\0",
{ "jan\0", "feb\0", "mar\0", "apr\0", "mai\0", "jun\0", "jul\0", "aug\0", "sep\0", "okt\0", "nov\0", "des\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
{ "jan.\0", "feb.\0", "mar.\0", "apr.\0", "mai\0", "jun.\0", "jul.\0", "aug.\0", "sep.\0", "okt.\0", "nov.\0", "des.\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
{ "man.\0", "tir.\0", "ons.\0", "tor.\0", "fre.\0", "lør.\0", "søn.\0" },
{ "mandag\0", "tirsdag\0", "onsdag\0", "torsdag\0", "fredag\0", "lørdag\0", "søndag\0" },
{ "M\0", "T\0", "O\0", "T\0", "F\0", "L\0", "S\0" },
{ "man.\0", "tir.\0", "ons.\0", "tor.\0", "fre.\0", "lør.\0", "søn.\0" },
{ "mandag\0", "tirsdag\0", "onsdag\0", "torsdag\0", "fredag\0", "lørdag\0", "søndag\0" },
{ "M\0", "T\0", "O\0", "T\0", "F\0", "L\0", "S\0" }
46, 44, 59, 37, 45, 43, 69, 2, 48,
8220, 8221, 8216, 8217,
Q_NULLPTR, Q_NULLPTR,
"%1, %2\0", "%1, %2\0", "%1, %2\0", "%1, %2\0",
"yyyy-MM-dd\0", "yyyy MMMM d\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
Q_NULLPTR, "%1%2\0", Q_NULLPTR, "NOK\0", Q_NULLPTR,
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "January\0", "February\0", "March\0", "April\0", "May\0", "June\0", "July\0", "August\0", "September\0", "October\0", "November\0", "December\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "M01\0", "M02\0", "M03\0", "M04\0", "M05\0", "M06\0", "M07\0", "M08\0", "M09\0", "M10\0", "M11\0", "M12\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "Monday\0", "Tuesday\0", "Wednesday\0", "Thursday\0", "Friday\0", "Saturday\0", "Sunday\0" },
{ "M\0", "T\0", "W\0", "T\0", "F\0", "S\0", "S\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0" }
}, // nb_NO
{
QLocale::Language::NorwegianBokmal, QLocale::Script::LatinScript, QLocale::Country::SvalbardAndJanMayen,
Qt::Monday, Qt::Saturday, Qt::Sunday,
44, 160, 59, 37, 8722, 43, 69, 2, 48,
171, 187, 8216, 8217,
"norsk bokmål\0", "Svalbard og Jan Mayen\0",
"%1, %2\0", "%1, %2\0", "%1 og %2\0", "%1 og %2\0",
"dd.MM.yyyy\0", "d. MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"a.m.\0", "p.m.\0",
"kr\0", "%2 %1\0", Q_NULLPTR, "NOK\0", "norske kroner\0",
{ "jan\0", "feb\0", "mar\0", "apr\0", "mai\0", "jun\0", "jul\0", "aug\0", "sep\0", "okt\0", "nov\0", "des\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
{ "jan.\0", "feb.\0", "mar.\0", "apr.\0", "mai\0", "jun.\0", "jul.\0", "aug.\0", "sep.\0", "okt.\0", "nov.\0", "des.\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
{ "man.\0", "tir.\0", "ons.\0", "tor.\0", "fre.\0", "lør.\0", "søn.\0" },
{ "mandag\0", "tirsdag\0", "onsdag\0", "torsdag\0", "fredag\0", "lørdag\0", "søndag\0" },
{ "M\0", "T\0", "O\0", "T\0", "F\0", "L\0", "S\0" },
{ "man.\0", "tir.\0", "ons.\0", "tor.\0", "fre.\0", "lør.\0", "søn.\0" },
{ "mandag\0", "tirsdag\0", "onsdag\0", "torsdag\0", "fredag\0", "lørdag\0", "søndag\0" },
{ "M\0", "T\0", "O\0", "T\0", "F\0", "L\0", "S\0" }
46, 44, 59, 37, 45, 43, 69, 2, 48,
8220, 8221, 8216, 8217,
Q_NULLPTR, Q_NULLPTR,
"%1, %2\0", "%1, %2\0", "%1, %2\0", "%1, %2\0",
"yyyy-MM-dd\0", "yyyy MMMM d\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
Q_NULLPTR, "%1%2\0", Q_NULLPTR, "NOK\0", Q_NULLPTR,
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "January\0", "February\0", "March\0", "April\0", "May\0", "June\0", "July\0", "August\0", "September\0", "October\0", "November\0", "December\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "M01\0", "M02\0", "M03\0", "M04\0", "M05\0", "M06\0", "M07\0", "M08\0", "M09\0", "M10\0", "M11\0", "M12\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "Monday\0", "Tuesday\0", "Wednesday\0", "Thursday\0", "Friday\0", "Saturday\0", "Sunday\0" },
{ "M\0", "T\0", "W\0", "T\0", "F\0", "S\0", "S\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "Mon\0", "Tue\0", "Wed\0", "Thu\0", "Fri\0", "Sat\0", "Sun\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0" }
}, // nb_SJ
{
QLocale::Language::NorthNdebele, QLocale::Script::LatinScript, QLocale::Country::Zimbabwe,
@ -10706,19 +10705,19 @@ static const QLocalePrivate localeTbl[] = {
{
QLocale::Language::NorwegianNynorsk, QLocale::Script::LatinScript, QLocale::Country::Norway,
Qt::Monday, Qt::Saturday, Qt::Sunday,
44, 160, 59, 37, 8722, 43, 69, 2, 48,
171, 187, 8216, 8217,
"norsk nynorsk\0", "Noreg\0",
"%1, %2\0", "%1, %2\0", "%1 og %2\0", "%1 og %2\0",
46, 44, 59, 37, 45, 43, 69, 2, 48,
8220, 8221, 8216, 8217,
Q_NULLPTR, "Noreg\0",
"%1, %2\0", "%1, %2\0", "%1, %2\0", "%1, %2\0",
"dd.MM.yyyy\0", "d. MMMM yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"f.m.\0", "e.m.\0",
"kr\0", "%1 %2\0", Q_NULLPTR, "NOK\0", "norske kroner\0",
{ "jan\0", "feb\0", "mar\0", "apr\0", "mai\0", "jun\0", "jul\0", "aug\0", "sep\0", "okt\0", "nov\0", "des\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
Q_NULLPTR, "%1 %2\0", Q_NULLPTR, "NOK\0", Q_NULLPTR,
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "January\0", "February\0", "March\0", "April\0", "May\0", "June\0", "July\0", "August\0", "September\0", "October\0", "November\0", "December\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "jan.\0", "feb.\0", "mars\0", "apr.\0", "mai\0", "juni\0", "juli\0", "aug.\0", "sep.\0", "okt.\0", "nov.\0", "des.\0" },
{ "januar\0", "februar\0", "mars\0", "april\0", "mai\0", "juni\0", "juli\0", "august\0", "september\0", "oktober\0", "november\0", "desember\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
{ "M01\0", "M02\0", "M03\0", "M04\0", "M05\0", "M06\0", "M07\0", "M08\0", "M09\0", "M10\0", "M11\0", "M12\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
{ "mån\0", "tys\0", "ons\0", "tor\0", "fre\0", "lau\0", "søn\0" },
{ "måndag\0", "tysdag\0", "onsdag\0", "torsdag\0", "fredag\0", "laurdag\0", "søndag\0" },
{ "M\0", "T\0", "O\0", "T\0", "F\0", "L\0", "S\0" },
@ -11172,7 +11171,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1 e %2\0", "%1 e %2\0",
"dd/MM/yyyy\0", "d 'dddd' MMMM 'dddd' yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"AM\0", "PM\0",
"CFA\0", "%2 %1\0", Q_NULLPTR, "XOF\0", "Franco CFA de BCEAO\0",
"FCFA\0", "%2 %1\0", Q_NULLPTR, "XOF\0", "Franco CFA de BCEAO\0",
{ "Jan\0", "Feb\0", "Mar\0", "Apr\0", "May\0", "Jun\0", "Jul\0", "Aug\0", "Sep\0", "Oct\0", "Nov\0", "Dec\0" },
{ "janeiro\0", "fevereiro\0", "março\0", "abril\0", "maio\0", "junho\0", "julho\0", "agosto\0", "setembro\0", "outubro\0", "novembro\0", "dezembro\0" },
{ "J\0", "F\0", "M\0", "A\0", "M\0", "J\0", "J\0", "A\0", "S\0", "O\0", "N\0", "D\0" },
@ -13380,7 +13379,7 @@ static const QLocalePrivate localeTbl[] = {
"%1, %2\0", "%1, %2\0", "%1, %2\0", "%1, %2\0",
"dd-MM-yyyy\0", "d MMMM, yyyy\0", "HH:mm\0", "HH:mm:ss t\0",
"Sub\0", "Ngo\0",
"CFA\0", "%2 %1\0", Q_NULLPTR, "XOF\0", "Franc CFA bu Afrik Sowwu-jant\0",
"FCFA\0", "%2 %1\0", Q_NULLPTR, "XOF\0", "Franc CFA bu Afrik Sowwu-jant\0",
{ "Sam\0", "Few\0", "Mar\0", "Awr\0", "Mee\0", "Suw\0", "Sul\0", "Ut\0", "Sàt\0", "Okt\0", "Now\0", "Des\0" },
{ "Samwiyee\0", "Fewriyee\0", "Mars\0", "Awril\0", "Mee\0", "Suwe\0", "Sulet\0", "Ut\0", "Sàttumbar\0", "Oktoobar\0", "Nowàmbar\0", "Desàmbar\0" },
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0", "8\0", "9\0", "10\0", "11\0", "12\0" },
@ -13464,7 +13463,7 @@ static const QLocalePrivate localeTbl[] = {
{ "1\0", "2\0", "3\0", "4\0", "5\0", "6\0", "7\0" }
}, // yav_CM
{
QLocale::Language::Yiddish, QLocale::Script::HebrewScript, QLocale::Country::World,
QLocale::Language::Yiddish, QLocale::Script::HebrewScript, QLocale::Country::world,
Qt::Monday, Qt::Saturday, Qt::Sunday,
46, 44, 59, 37, 45, 43, 69, 2, 48,
8221, 8221, 8217, 8217,
@ -14298,7 +14297,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Esperanto, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Esperanto, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Esperanto, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Spanish, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -14562,7 +14561,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Interlingua, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Interlingua, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Interlingua, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Iban, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -14598,7 +14597,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Ido, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Ido, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Ido, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Icelandic, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -14626,7 +14625,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Lojban, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Lojban, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Lojban, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Ngomba, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -15322,7 +15321,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Prussian, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Prussian, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Prussian, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Pashto, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -16954,7 +16953,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Volapuk, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Volapuk, QLocale::Script::LatinScript, QLocale::Country::World
QLocale::Language::Volapuk, QLocale::Script::LatinScript, QLocale::Country::world
},
{
QLocale::Language::Votic, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -17026,7 +17025,7 @@ static const struct subtagAliasTblData {
},
{
QLocale::Language::Yiddish, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
QLocale::Language::Yiddish, QLocale::Script::HebrewScript, QLocale::Country::World
QLocale::Language::Yiddish, QLocale::Script::HebrewScript, QLocale::Country::world
},
{
QLocale::Language::Yoruba, QLocale::Script::AnyScript, QLocale::Country::AnyCountry,
@ -17400,10 +17399,9 @@ static const struct languageAliasTblData {
{ QLatin1String("nno"), QLatin1String("nn") },
{ QLatin1String("nns"), QLatin1String("nbr") },
{ QLatin1String("nnx"), QLatin1String("ngv") },
{ QLatin1String("no"), QLatin1String("nb") },
{ QLatin1String("nob"), QLatin1String("nb") },
{ QLatin1String("noo"), QLatin1String("dtd") },
{ QLatin1String("nor"), QLatin1String("nb") },
{ QLatin1String("nor"), QLatin1String("no") },
{ QLatin1String("npi"), QLatin1String("ne") },
{ QLatin1String("nts"), QLatin1String("pij") },
{ QLatin1String("nxu"), QLatin1String("bpp") },

View file

@ -171,8 +171,8 @@ void tst_QLocale::ctor()
TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, World, QLocale::English, QLocale::World)
TEST_CTOR(English, France, QLocale::English, QLocale::World)
TEST_CTOR(English, world, QLocale::English, QLocale::world)
TEST_CTOR(English, France, QLocale::English, QLocale::world)
TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
TEST_CTOR(French, France, QLocale::French, QLocale::France)
@ -184,7 +184,7 @@ void tst_QLocale::ctor()
{
QLocale l;
QVERIFY(l.language() == QLocale::English);
QVERIFY(l.country() == QLocale::World);
QVERIFY(l.country() == QLocale::world);
}
TEST_CTOR(French, France, QLocale::French, QLocale::France)
@ -193,7 +193,7 @@ void tst_QLocale::ctor()
TEST_CTOR(French, France, QLocale::French, QLocale::France)
TEST_CTOR(C, AnyCountry, QLocale::C, QLocale::AnyCountry)
TEST_CTOR(C, France, QLocale::C, QLocale::AnyCountry)
TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::World)
TEST_CTOR(Aymara, AnyCountry, QLocale::English, QLocale::world)
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom));
@ -222,8 +222,8 @@ void tst_QLocale::ctor()
TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, World, QLocale::English, QLocale::World)
TEST_CTOR(English, France, QLocale::English, QLocale::World)
TEST_CTOR(English, world, QLocale::English, QLocale::world)
TEST_CTOR(English, France, QLocale::English, QLocale::world)
TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
TEST_CTOR(French, France, QLocale::French, QLocale::France)
@ -244,8 +244,8 @@ void tst_QLocale::ctor()
TEST_CTOR(English, AnyCountry, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, UnitedStates, QLocale::English, QLocale::UnitedStates)
TEST_CTOR(English, World, QLocale::English, QLocale::World)
TEST_CTOR(English, France, QLocale::English, QLocale::World)
TEST_CTOR(English, world, QLocale::English, QLocale::world)
TEST_CTOR(English, France, QLocale::English, QLocale::world)
TEST_CTOR(English, UnitedKingdom, QLocale::English, QLocale::UnitedKingdom)
TEST_CTOR(French, France, QLocale::French, QLocale::France)
@ -301,13 +301,13 @@ void tst_QLocale::ctor()
TEST_CTOR("en.bla", English, UnitedStates)
TEST_CTOR("en@bla", English, UnitedStates)
TEST_CTOR("en_blaaa", English, UnitedStates)
TEST_CTOR("en_zz", English, World)
TEST_CTOR("en_001", English, World)
TEST_CTOR("en_001.bla", English, World)
TEST_CTOR("en_001@.bla", English, World)
TEST_CTOR("en_001@bla", English, World)
TEST_CTOR("en-001", English, World)
TEST_CTOR("en-001@bla", English, World)
TEST_CTOR("en_zz", English, world)
TEST_CTOR("en_001", English, world)
TEST_CTOR("en_001.bla", English, world)
TEST_CTOR("en_001@.bla", English, world)
TEST_CTOR("en_001@bla", English, world)
TEST_CTOR("en-001", English, world)
TEST_CTOR("en-001@bla", English, world)
TEST_CTOR("en_GB", English, UnitedKingdom)
TEST_CTOR("en_GB.bla", English, UnitedKingdom)
TEST_CTOR("en_GB@.bla", English, UnitedKingdom)
@ -453,7 +453,7 @@ void tst_QLocale::unixLocaleName()
QLocale::setDefault(QLocale(QLocale::C));
TEST_NAME(C, AnyCountry, "C")
TEST_NAME(English, World, "en_001")
TEST_NAME(English, world, "en_001")
TEST_NAME(English, AnyCountry, "en_US")
TEST_NAME(English, UnitedStates, "en_US")
TEST_NAME(English, UnitedKingdom, "en_GB")