Update CLDR to v42

New languages (and one local for each) added with v42 - Haryanvi - Moksha - Northern Frisian - Obolo - Pijin - Rajasthani - Toki Pona It also appears that Canada has changed its date format. Modify the relevant test case to reflect this change. Task-number: QTBUG-110333 Pick-to: 6.5 Change-Id: Ia8975c2866cd54c9e565543d05bacd52f4987909 Reviewed-by: Mårten Nordheim <[email protected]> Reviewed-by: Edward Welbourne <[email protected]>
ClassAteam · Feb 7, 2023 · 9a8b947 · 9a8b947
1 parent 275d510
commit 9a8b947
Show file tree

Hide file tree

Showing 10 changed files with 5,692 additions and 5,406 deletions.
diff --git a/src/corelib/text/UNICODE_LICENSE.txt b/src/corelib/text/UNICODE_LICENSE.txt
@@ -13,7 +13,7 @@ THE DATA FILES OR SOFTWARE.
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2020 Unicode, Inc. All rights reserved.
+Copyright © 1991-2022 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining

diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h
@@ -369,6 +369,13 @@ class Q_CORE_EXPORT QLocale
         Zulu = 327,
         Kaingang = 328,
         Nheengatu = 329,
+        Haryanvi = 330,
+        NorthernFrisian = 331,
+        Rajasthani = 332,
+        Moksha = 333,
+        TokiPona = 334,
+        Pijin = 335,
+        Obolo = 336,
 
         Afan = Oromo,
         Bengali = Bangla,
@@ -390,7 +397,7 @@ class Q_CORE_EXPORT QLocale
         Uigur = Uyghur,
         Walamo = Wolaytta,
 
-        LastLanguage = Nheengatu
+        LastLanguage = Obolo
     };
 
     enum Script : ushort {

diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
@@ -50,7 +50,7 @@
     \note For the current keyboard input locale take a look at
     QInputMethod::locale().
 
-    QLocale's data is based on Common Locale Data Repository v41.
+    QLocale's data is based on Common Locale Data Repository v42.
 
     \section1 Matching combinations of language, script and territory
 
@@ -197,6 +197,7 @@
     \value Gujarati
     \value Gusii
     \value Haitian
+    \value [since 6.5] Haryanvi
     \value Hausa
     \value Hawaiian
     \value Hebrew
@@ -292,6 +293,7 @@
     \value Meru
     \value Meta
     \value [since 5.5] Mohawk
+    \value [since 6.5] Moksha
     \value Mongolian
     \value Morisyen
     \value Mundang
@@ -308,6 +310,7 @@
     \value [since 6.0] NigerianPidgin
     \value Ngomba
     \value [since 5.5] Nko
+    \value [since 6.5] NorthernFrisian
     \value [since 5.7] NorthernLuri
     \value NorthernSami
     \value NorthernSotho
@@ -317,6 +320,7 @@
     \value Nuer
     \value Nyanja
     \value Nyankole
+    \value [since 6.5] Obolo
     \value Occitan
     \value [since 6.0] Odia
     \value Ojibwa
@@ -334,11 +338,13 @@
     \value Pashto
     \value Persian
     \value [since 5.1] Phoenician
+    \value [since 6.5] Pijin
     \value Polish
     \value Portuguese
     \value [since 5.5] Prussian
     \value Punjabi
     \value Quechua
+    \value [since 6.5] Rajasthani
     \value RhaetoRomance Obsolete, please use Romansh
     \value Romanian
     \value Romansh
@@ -399,6 +405,7 @@
     \value Tigre
     \value Tigrinya
     \value [since 5.7] TokelauLanguage
+    \value [since 6.5] TokiPona
     \value [since 5.7] TokPisin
     \value Tongan
     \value Tsonga