diff options
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qlocale.h | 4 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/text/qlocale_data_p.h | 62 |
3 files changed, 58 insertions, 10 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index f69ea2ace0f..f5f7c4c642b 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -389,6 +389,8 @@ public: Kuvi = 344, KaraKalpak = 345, SwampyCree = 346, + Ladin = 347, + Shan = 348, Afan = Oromo, Bengali = Bangla, @@ -410,7 +412,7 @@ public: Uigur = Uyghur, Walamo = Wolaytta, - LastLanguage = SwampyCree + LastLanguage = Shan }; enum Script : ushort { diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index 7c2f4e62a4b..336c537f4fc 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -276,6 +276,7 @@ \value Kwanyama Obsolete, please use Kuanyama \value Kwasio \value [since 6.0] Kyrgyz + \value [since 6.11] Ladin \value [since 5.3] Lakota \value Langi \value Lao @@ -390,6 +391,7 @@ \value Sena \value Serbian \value Shambala + \value [since 6.11] Shan \value Shona \value SichuanYi \value [since 5.12] Sicilian diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h index 9ae83bf982a..0403bc6cd32 100644 --- a/src/corelib/text/qlocale_data_p.h +++ b/src/corelib/text/qlocale_data_p.h @@ -496,6 +496,8 @@ static inline constexpr QLocaleId likely_subtags[] = { { 344, 0, 0 }, { 344, 66, 110 }, // kxv -> kxv_Latn_IN { 345, 0, 0 }, { 345, 27, 251 }, // kaa -> kaa_Cyrl_UZ { 346, 0, 0 }, { 346, 18, 41 }, // csw -> csw_Cans_CA + { 347, 0, 0 }, { 347, 66, 117 }, // lld -> lld_Latn_IT + { 348, 0, 0 }, { 348, 86, 161 }, // shn -> shn_Mymr_MM { 0, 4, 1 }, { 228, 4, 1 }, // und_Arab_AF -> fa_Arab_AF { 0, 27, 1 }, { 345, 27, 1 }, // und_Cyrl_AF -> kaa_Cyrl_AF { 0, 66, 1 }, { 299, 66, 1 }, // und_Latn_AF -> tk_Latn_AF @@ -1222,6 +1224,8 @@ static inline constexpr quint16 locale_index[] = { 700, // Kuvi 704, // Kara-Kalpak 706, // Swampy Cree + 707, // Ladin + 708, // Shan 0 // trailing 0 }; @@ -1934,6 +1938,9 @@ static inline constexpr QLocaleData locale_data[] = { { 345, 27, 251, 0, 0, 1499, 1499, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 154, 102, 10, 0,28643,28643,28697,28697,28724,28724, 0, 0, 0, 5, 22, 0, 0, 15, 0, 7479, 7491, 6, 6, 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 10, 13, 5, 54, 54, 27, 27, 13, 13, 2, 2, 4, 17, 23, 0, 0, 5, 0, 12, 9, {85,90,83}, 2, 0, 1, 6, 7, 1, 3, 3 }, // Kara-Kalpak/Cyrillic/Uzbekistan { 345, 66, 251, 0, 0, 0, 0, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 154, 102, 10, 0, 56, 56, 56, 56, 83, 83, 0, 0, 0, 5, 22, 0, 0, 15, 0, 0, 0, 6, 6, 6, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 10, 13, 5, 27, 27, 27, 27, 13, 13, 2, 2, 4, 17, 23, 0, 0, 5, 0, 0, 0, {85,90,83}, 2, 0, 1, 6, 7, 1, 3, 3 }, // Kara-Kalpak/Latin/Uzbekistan { 346, 18, 41, 0, 0, 0, 1508, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 154, 102, 23, 38,28737,28737,28737,28737,28804,28804, 916, 965, 0, 5, 22, 266, 6050, 15, 0, 7500, 7507, 6, 6, 6, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 10, 15, 7, 67, 67, 67, 67, 13, 13, 2, 2, 4, 17, 23, 3, 13, 5, 0, 7, 3, {67,65,68}, 2, 0, 7, 6, 7, 1, 3, 3 }, // Swampy Cree/Canadian Aboriginal/Canada + { 347, 66, 117, 0, 0, 76, 76, 6, 1, 0, 2, 3, 4, 5, 10, 15, 14, 17, 16, 2254, 48, 10, 0,28817,28817,28867,28867, 6957, 6957, 0, 0, 0, 5, 22, 22, 83, 4, 0, 7510, 7515, 6, 6, 7, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 22, 8, 13, 5, 50, 50, 29, 29, 13, 13, 2, 2, 4, 17, 23, 1, 4, 5, 0, 5, 5, {69,85,82}, 2, 1, 1, 6, 7, 1, 3, 3 }, // Ladin/Latin/Italy + { 348, 86, 161, 1517, 1517, 1523, 1523, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 2276, 102, 10, 0,28896,28932,28896,28896,29003,29003, 918, 967, 1461, 5, 22, 134, 6063, 15, 0, 7520, 7523, 6, 6, 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 18, 10, 13, 5, 36, 71, 36, 36, 23, 23, 9, 8, 4, 17, 23, 1, 15, 5, 0, 3, 23, {77,77,75}, 0, 0, 7, 6, 7, 1, 3, 3 }, // Shan/Myanmar/Myanmar + { 348, 86, 231, 1517, 1517, 1523, 1523, 6, 0, 1, 2, 3, 4, 5, 10, 14, 15, 16, 17, 2276, 102, 10, 0,28896,28932,28896,28896,29003,29003, 918, 967, 1461, 5, 22, 341, 6078, 15, 0, 7520, 7546, 6, 6, 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 18, 10, 13, 5, 36, 71, 36, 36, 23, 23, 9, 8, 4, 17, 23, 1, 8, 5, 0, 3, 9, {84,72,66}, 2, 1, 7, 6, 7, 1, 3, 3 }, // Shan/Myanmar/Thailand { 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, 0, 0, 0 } // trailing zeros }; @@ -2064,7 +2071,8 @@ static inline constexpr char16_t list_pattern_part_data[] = { 0x32, 0x25, 0x31, 0x20, 0xb05, 0xb21, 0xb3c, 0xb47, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xc2e, 0xc30, 0xc3f, 0xc2f, 0xc41, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x4b3, 0x4d9, 0x43c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x140a, -0x1420, 0x1418, 0x20, 0x25, 0x32 +0x1420, 0x1418, 0x20, 0x25, 0x32, 0x25, 0x31, 0x104a, 0x20, 0x25, 0x32, 0x25, +0x31, 0x20, 0x101c, 0x1084, 0x1088, 0x20, 0x25, 0x32 }; static inline constexpr char16_t single_character_data[] = { @@ -2266,7 +2274,11 @@ static inline constexpr char16_t date_format_data[] = { 0x2c, 0x4d, 0x4d, 0x2c, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x6f, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d, -0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2f, 0x79, 0x79, 0x79, 0x79 +0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, +0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, +0x64, 0x6c, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, +0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20, 0x2d, 0x20, 0x64, 0x64, +0x64, 0x64 }; static inline constexpr char16_t time_format_data[] = { @@ -4729,7 +4741,24 @@ static inline constexpr char16_t days_data[] = { 0x140b, 0x1431, 0x1426, 0x1455, 0x1418, 0x1423, 0x3b, 0x146b, 0x1473, 0x1428, 0x20, 0x14ab, 0x144e, 0x14c7, 0x140d, 0x146e, 0x14ef, 0x1473, 0x1424, 0x3b, 0x14ab, 0x144e, 0x14c7, 0x140d, 0x146e, 0x14ef, 0x1473, 0x1424, 0x140a, 0x3b, 0x1434, 0x3b, 0x14c3, 0x3b, 0x140b, 0x3b, -0x1434, 0x3b, 0x146b, 0x3b, 0x14ab +0x1434, 0x3b, 0x146b, 0x3b, 0x14ab, 0x64, 0x6f, 0x6d, 0xeb, 0x6e, 0x69, 0x61, +0x3b, 0x6c, 0xf6, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x6d, 0x65, 0x72, 0x74, +0x65, 0x73, 0x63, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x75, 0x69, 0x3b, 0x6a, +0xf6, 0x62, 0x69, 0x61, 0x3b, 0x76, 0xeb, 0x6e, 0x64, 0x72, 0x65, 0x73, +0x3b, 0x73, 0x61, 0x62, 0x65, 0x64, 0x61, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, +0xf6, 0x6e, 0x3b, 0x6d, 0x65, 0x72, 0x74, 0x3b, 0x6d, 0x65, 0x72, 0x63, +0x3b, 0x6a, 0xf6, 0x62, 0x3b, 0x76, 0xeb, 0x6e, 0x3b, 0x73, 0x61, 0x62, +0x1010, 0x102d, 0x1010, 0x103a, 0x1089, 0x3b, 0x1078, 0x107c, 0x103a, 0x3b, 0x1075, 0x1062, +0x107c, 0x103a, 0x1038, 0x3b, 0x1015, 0x102f, 0x1010, 0x103a, 0x1089, 0x3b, 0x107d, 0x1010, +0x103a, 0x1038, 0x3b, 0x101e, 0x102f, 0x1075, 0x103a, 0x1038, 0x3b, 0x101e, 0x101d, 0x103a, +0x101d, 0x107c, 0x103a, 0x1038, 0x1022, 0x1083, 0x1038, 0x1010, 0x102d, 0x1010, 0x103a, 0x1089, +0x3b, 0x101d, 0x107c, 0x103a, 0x1038, 0x1078, 0x107c, 0x103a, 0x3b, 0x101d, 0x107c, 0x103a, +0x1038, 0x1022, 0x1004, 0x103a, 0x1038, 0x1075, 0x1062, 0x107c, 0x103a, 0x1038, 0x3b, 0x101d, +0x107c, 0x103a, 0x1038, 0x1015, 0x102f, 0x1010, 0x103a, 0x1089, 0x3b, 0x101d, 0x107c, 0x103a, +0x1038, 0x107d, 0x1010, 0x103a, 0x1038, 0x3b, 0x101d, 0x107c, 0x103a, 0x1038, 0x101e, 0x102f, +0x1075, 0x103a, 0x1038, 0x3b, 0x101d, 0x107c, 0x103a, 0x1038, 0x101e, 0x101d, 0x103a, 0x1010, +0x102d, 0x2e, 0x3b, 0x1078, 0x2e, 0x3b, 0x1075, 0x2e, 0x3b, 0x1015, 0x102f, 0x2e, +0x3b, 0x107d, 0x2e, 0x3b, 0x101e, 0x102f, 0x2e, 0x3b, 0x101e, 0x2e }; static inline constexpr char16_t byte_unit_data[] = { @@ -4854,7 +4883,8 @@ static inline constexpr char16_t byte_unit_data[] = { 0x3b, 0x54, 0xed, 0x62, 0xe1, 0xec, 0x74, 0xec, 0x3b, 0x50, 0xed, 0x62, 0xe1, 0xec, 0x74, 0xec, 0x3b, 0x45, 0x42, 0xe0, 0x77, 0x254, 0x301, 0x6e, 0x20, 0x62, 0xe1, 0xec, 0x74, 0xec, 0x62, 0x79, 0x74, 0x65, 0x20, 0x61, -0x67, 0x62, 0x79, 0x74, 0x65, 0x2d, 0x69, 0x74, 0x61 +0x67, 0x62, 0x79, 0x74, 0x65, 0x2d, 0x69, 0x74, 0x61, 0x1015, 0x1062, 0x1086, +0x1089 }; static inline constexpr char16_t am_data[] = { @@ -4934,7 +4964,8 @@ static inline constexpr char16_t am_data[] = { 0x70, 0x65, 0x6e, 0x20, 0x73, 0x75, 0x6e, 0x6f, 0x28a, 0x73, 0x68, 0x69, 0x6c, 0xe8, 0x20, 0x6b, 0x28a, 0x62, 0x6f, 0x256, 0x75, 0x92d, 0x94d, 0x92f, 0x93e, 0x917, 0x93e, 0x90f, 0x20, 0x90f, 0x92e, 0xb0f, 0x20, 0xb0f, 0xb2e, 0xc0e, -0x20, 0xc0e, 0xc2e, 0xc4d, 0x1401, 0x14bc +0x20, 0xc0e, 0xc2e, 0xc4d, 0x1401, 0x14bc, 0x1010, 0x103d, 0x107c, 0x103a, 0x1088, 0x1078, +0x101d, 0x103a, 0x1089 }; static inline constexpr char16_t pm_data[] = { @@ -5018,7 +5049,8 @@ static inline constexpr char16_t pm_data[] = { 0x69, 0x20, 0x73, 0x75, 0x6e, 0x6f, 0x28a, 0x73, 0x68, 0x69, 0x6c, 0xe8, 0x20, 0x6b, 0x28a, 0x73, 0x61, 0x73, 0x28a, 0x926, 0x92a, 0x947, 0x939, 0x930, 0x93e, 0x2f, 0x938, 0x902, 0x91c, 0x93e, 0xb2a, 0xb3f, 0x20, 0xb0f, 0xb2e, 0xc2a, -0xc3f, 0x20, 0xc0e, 0xc2e, 0xc4d, 0x1432, 0x14bc +0xc3f, 0x20, 0xc0e, 0xc2e, 0xc4d, 0x1432, 0x14bc, 0x1010, 0x103d, 0x107c, 0x103a, 0x1088, +0x101c, 0x1083, 0x1088 }; static inline constexpr char16_t currency_symbol_data[] = { @@ -5560,7 +5592,9 @@ static inline constexpr char16_t currency_display_name_data[] = { 0x92c, 0x93e, 0x930, 0x924, 0x20, 0x924, 0x93f, 0x20, 0x91f, 0x93e, 0x915, 0x93e, 0x901, 0xb2c, 0xb3e, 0xb30, 0xb24, 0x20, 0xb24, 0xb3f, 0x20, 0xb1f, 0xb3e, 0xb15, 0xb3e, 0xb01, 0x1472, 0x14c0, 0x144e, 0x152d, 0x1423, 0x20, 0x142f, 0x152d, 0x1420, 0x141a, -0x1431, 0x1422, 0x1420 +0x1431, 0x1422, 0x1420, 0x1075, 0x103b, 0x1062, 0x1015, 0x103a, 0x1088, 0x1019, 0x103b, 0x1062, +0x107c, 0x103a, 0x1087, 0x1019, 0x1083, 0x1087, 0x101d, 0x1062, 0x1010, 0x103a, 0x1087, 0x1011, +0x1086, 0x1038 }; static inline constexpr char16_t currency_format_data[] = { @@ -6203,7 +6237,11 @@ static inline constexpr char16_t endonyms_data[] = { 0xb30, 0xb24, 0xc15, 0xc41, 0xc35, 0xc3f, 0xc2c, 0xc3e, 0xc30, 0xc24, 0xc26, 0xc46, 0xc38, 0xc3e, 0xc02, 0x49b, 0x430, 0x440, 0x430, 0x49b, 0x430, 0x43b, 0x43f, 0x430, 0x49b, 0x448, 0x430, 0x4e8, 0x437, 0x431, 0x435, 0x43a, 0x441, 0x442, 0x430, 0x43d, -0x14c0, 0x1426, 0x1403, 0x14c7, 0x140d, 0x140f, 0x1423, 0x1473, 0x14c7, 0x1455 +0x14c0, 0x1426, 0x1403, 0x14c7, 0x140d, 0x140f, 0x1423, 0x1473, 0x14c7, 0x1455, 0x6c, 0x61, +0x64, 0x69, 0x6e, 0x54, 0x61, 0x6c, 0x69, 0x61, 0x1010, 0x1086, 0x1038, 0x1019, +0x103b, 0x1062, 0x107c, 0x103a, 0x1087, 0x1019, 0x1083, 0x1087, 0x20, 0x28, 0x1019, 0x102d, +0x1030, 0x1004, 0x103a, 0x1038, 0x1019, 0x1062, 0x107c, 0x103a, 0x1088, 0x29, 0x1019, 0x102d, +0x1030, 0x1004, 0x103a, 0x1038, 0x1011, 0x1086, 0x1038 }; static inline constexpr char language_name_list[] = @@ -6554,6 +6592,8 @@ static inline constexpr char language_name_list[] = "Kuvi\0" "Kara-Kalpak\0" "Swampy Cree\0" +"Ladin\0" +"Shan\0" ; static inline constexpr quint16 language_name_index[] = { @@ -6904,9 +6944,11 @@ static inline constexpr quint16 language_name_index[] = { 2900, // Kuvi 2905, // Kara-Kalpak 2917, // Swampy Cree + 2929, // Ladin + 2935, // Shan }; -constexpr std::array<LanguageCodeEntry, 347> languageCodeList { +constexpr std::array<LanguageCodeEntry, 349> languageCodeList { LanguageCodeEntry {{}, {'u', 'n', 'd'}, {'u', 'n', 'd'}, {'u', 'n', 'd'}}, // AnyLanguage LanguageCodeEntry {{}, {'u', 'n', 'd'}, {'u', 'n', 'd'}, {'u', 'n', 'd'}}, // C LanguageCodeEntry {{'a', 'b'}, {'a', 'b', 'k'}, {'a', 'b', 'k'}, {'a', 'b', 'k'}}, // Abkhazian @@ -7254,6 +7296,8 @@ constexpr std::array<LanguageCodeEntry, 347> languageCodeList { LanguageCodeEntry {{}, {}, {}, {'k', 'x', 'v'}}, // Kuvi LanguageCodeEntry {{}, {'k', 'a', 'a'}, {'k', 'a', 'a'}, {'k', 'a', 'a'}}, // Kara-Kalpak LanguageCodeEntry {{}, {}, {}, {'c', 's', 'w'}}, // Swampy Cree + LanguageCodeEntry {{}, {}, {}, {'l', 'l', 'd'}}, // Ladin + LanguageCodeEntry {{}, {'s', 'h', 'n'}, {'s', 'h', 'n'}, {'s', 'h', 'n'}}, // Shan }; static inline constexpr char script_name_list[] = |