Add locale support for Cebuano and Erzya languages (new in CLDR v35.1)

Change-Id: I5d0ee7bc27eeca1c046d442b0410128ea5abbdb3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
 
 

4 files changed, 35 insertions, 4 deletions

diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 977c4c6c9c..09de830ca3 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -441,6 +441,8 @@ public:
         Sicilian = 362,
         SouthernKurdish = 363,
         WesternBalochi = 364,
+        Cebuano = 365,
+        Erzya = 366,
 
         Afan = Oromo,
         Bhutani = Dzongkha,
@@ -457,7 +459,7 @@ public:
         Twi = Akan,
         Uigur = Uighur,
 
-        LastLanguage = WesternBalochi
+        LastLanguage = Erzya
     };
 
     enum Script {
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 484987c40b..426cb9dbeb 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -164,6 +164,7 @@
     \value Cantonese Since Qt 5.7
     \value Carian Since Qt 5.1
     \value Catalan
+    \value Cebuano Since Qt 5.14
     \value CentralKurdish Since Qt 5.5
     \value CentralMoroccoTamazight
     \value Chakma Since Qt 5.1
@@ -194,6 +195,7 @@
     \value EasternKayah Since Qt 5.1
     \value Embu
     \value English
+    \value Erzya Since Qt 5.14
     \value Esperanto
     \value Estonian
     \value Etruscan Since Qt 5.1
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h
index 3e4fd4b8aa..2c351a3fb1 100644
--- a/src/corelib/tools/qlocale_data_p.h
+++ b/src/corelib/tools/qlocale_data_p.h
@@ -141,6 +141,7 @@ static const QLocaleId likely_subtags[] = {
     { 156,   0,   0 }, { 156,   7, 157 }, // cch -> cch_Latn_NG
     { 272,   0,   0 }, { 272,  46,  18 }, // ccp -> ccp_Cakm_BD
     { 218,   0,   0 }, { 218,   2, 178 }, // ce -> ce_Cyrl_RU
+    { 365,   0,   0 }, { 365,   7, 170 }, // ceb -> ceb_Latn_PH
     { 211,   0,   0 }, { 211,   7, 221 }, // cgg -> cgg_Latn_UG
     { 217,   0,   0 }, { 217,   7,  89 }, // ch -> ch_Latn_GU
     { 190,   0,   0 }, { 190,  12, 225 }, // chr -> chr_Cher_US
@@ -327,6 +328,7 @@ static const QLocaleId likely_subtags[] = {
     {  78,   0,   0 }, {  78,   7, 133 }, // mt -> mt_Latn_MT
     { 245,   0,   0 }, { 245,   7,  37 }, // mua -> mua_Latn_CM
     {  21,   0,   0 }, {  21,  25, 147 }, // my -> my_Mymr_MM
+    { 366,   0,   0 }, { 366,   2, 178 }, // myv -> myv_Cyrl_RU
     { 273,   0,   0 }, { 273,  71, 102 }, // myz -> myz_Mand_IR
     { 346,   0,   0 }, { 346,   1, 102 }, // mzn -> mzn_Arab_IR
     {  83,   0,   0 }, {  83,   7, 149 }, // na -> na_Latn_NR
@@ -1262,6 +1264,8 @@ static const quint16 locale_index[] = {
    580, // Sicilian
    581, // Southern Kurdish
    582, // Western Balochi
+   583, // Cebuano
+   584, // Erzya
      0 // trailing 0
 };
 
@@ -1850,6 +1854,8 @@ static const QLocaleData locale_data[] = {
     {    362,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sicilian/Latin/Italy
     {    363,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Southern Kurdish/Arabic/Iran
     {    364,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      175,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Western Balochi/Arabic/Pakistan
+    {    365,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     897,9 ,     906,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  39365,46 ,  39411,88 ,  39499,24 ,  39365,46 ,  39411,88 ,  39499,24 ,  21469,25 ,  21494,56 ,  21550,14 ,  21469,25 ,  21494,56 ,  21550,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,72,80},      178,1 ,       0,7 ,       4,4 ,       4,0 ,    5949,7 ,    4701,9 ,     2,     1,     7,     6,     7 }, // Cebuano/Latin/Philippines
+    {    366,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,    368,48 ,    368,48 ,    158,27 ,    368,48 ,    368,48 ,    158,27 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Erzya/Cyrillic/Russia
     {      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,       0,       0,       0,       0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,0,     0,0,     0,0,    {0,0,0},         0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,     0,     0,     0,     0 } // trailing 0s
 };
 
@@ -4006,7 +4012,15 @@ static const ushort months_data[] = {
 0x6d5, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659,
 0x623, 0x646, 0x3b, 0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627,
 0x645, 0x631, 0x3b, 0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b, 0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626,
-0x633, 0x627, 0x645, 0x631, 0x3b
+0x633, 0x627, 0x645, 0x631, 0x3b, 0x45, 0x6e, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b,
+0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f,
+0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62,
+0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
+0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f,
+0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e,
+0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45,
+0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
+0x3b, 0x44, 0x3b
 };
 
 static const ushort days_data[] = {
@@ -5083,7 +5097,12 @@ static const ushort days_data[] = {
 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f,
 0x68, 0x6f, 0x3b, 0x74, 0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0x75, 0x76, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70,
 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0x75, 0x76, 0x3b, 0x70, 0x3b, 0x56, 0x3b, 0x4d,
-0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b
+0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72,
+0x3b, 0x4d, 0x6b, 0x73, 0x3b, 0x48, 0x75, 0x3b, 0x42, 0x69, 0x3b, 0x53, 0x61, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67,
+0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72,
+0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e,
+0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b,
+0x42, 0x3b, 0x53, 0x3b
 };
 
 static const ushort byte_unit_data[] = {
@@ -6446,7 +6465,7 @@ static const ushort endonyms_data[] = {
 0x73, 0x6b, 0x61, 0x6e, 0x73, 0x77, 0x12b, 0x74, 0x61, 0x69, 0x61, 0x6e, 0x61, 0x72, 0xe2, 0x161, 0x6b, 0x69, 0x65, 0x6c,
 0xe2, 0x53, 0x75, 0x6f, 0x6d, 0xe2, 0x645, 0x627, 0x632, 0x631, 0x648, 0x646, 0x6cc, 0x644, 0x6ca, 0x631, 0x6cc, 0x20, 0x634, 0x648,
 0x645, 0x627, 0x644, 0x6cc, 0x7cb5, 0x8a9e, 0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340,
-0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd
+0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd, 0x43, 0x65, 0x62, 0x75, 0x61, 0x6e, 0x6f
 };
 
 static const char language_name_list[] =
@@ -6815,6 +6834,8 @@ static const char language_name_list[] =
 "Sicilian\0"
 "Southern Kurdish\0"
 "Western Balochi\0"
+"Cebuano\0"
+"Erzya\0"
 ;
 
 static const quint16 language_name_index[] = {
@@ -7183,6 +7204,8 @@ static const quint16 language_name_index[] = {
   3084, // Sicilian
   3093, // Southern Kurdish
   3110, // Western Balochi
+  3126, // Cebuano
+  3134, // Erzya
 };
 
 static const char script_name_list[] =
@@ -8371,6 +8394,8 @@ static const unsigned char language_code_list[] =
 "scn" // Sicilian
 "sdh" // Southern Kurdish
 "bgn" // Western Balochi
+"ceb" // Cebuano
+"myv" // Erzya
 ;
 
 static const unsigned char script_code_list[] =
diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py
index 26bb74d1fe..0e40d8a9ee 100644
--- a/util/locale_database/enumdata.py
+++ b/util/locale_database/enumdata.py
@@ -402,6 +402,8 @@ language_list = {
     362: ["Sicilian",                    "scn"],
     363: ["Southern Kurdish",            "sdh"],
     364: ["Western Balochi",             "bgn"],
+    365: ["Cebuano",                     "ceb"],
+    366: ["Erzya",                       "myv"],
 }
 
 language_aliases = {