Revise enumdata.py's names to more closely match CLDR's

We could already use dashes in some, rather than spaces, and now no
longer need to capitalize each word. This changes the *_name_list[]
entries for affected languages to more closely match what CLDR gives
as their names. It also amends various comments. Added tests for the
QLocale::*ToString() functions to cover the entries changed.

Task-number: QTBUG-94460
Change-Id: I0163795cb282881f15a97be00a5311c1936c3a09
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py
index 3a52ae35fc..b1de22b7f7 100644
--- a/util/locale_database/enumdata.py
+++ b/util/locale_database/enumdata.py
@@ -155,7 +155,7 @@ language_map = {
     120: ("Japanese",                    "ja"),
     121: ("Javanese",                    "jv"),
     122: ("Jju",                         "kaj"),
-    123: ("Jola Fonyi",                  "dyo"),
+    123: ("Jola-Fonyi",                  "dyo"),
     124: ("Kabuverdianu",                "kea"),
     125: ("Kabyle",                      "kab"),
     126: ("Kako",                        "kkj"),
@@ -196,7 +196,7 @@ language_map = {
     161: ("Lojban",                      "jbo"),
     162: ("Lower Sorbian",               "dsb"),
     163: ("Low German",                  "nds"),
-    164: ("Luba Katanga",                "lu"),
+    164: ("Luba-Katanga",                "lu"),
     165: ("Lule Sami",                   "smj"),
     166: ("Luo",                         "luo"),
     167: ("Luxembourgish",               "lb"),
@@ -204,7 +204,7 @@ language_map = {
     169: ("Macedonian",                  "mk"),
     170: ("Machame",                     "jmc"),
     171: ("Maithili",                    "mai"),
-    172: ("Makhuwa Meetto",              "mgh"),
+    172: ("Makhuwa-Meetto",              "mgh"),
     173: ("Makonde",                     "kde"),
     174: ("Malagasy",                    "mg"), # macrolanguage
     175: ("Malayalam",                   "ml"),
@@ -463,8 +463,8 @@ territory_map = {
      53: ("Cocos Islands",                                "CC"),
      54: ("Colombia",                                     "CO"),
      55: ("Comoros",                                      "KM"),
-     56: ("Congo Brazzaville",                            "CG"),
-     57: ("Congo Kinshasa",                               "CD"),
+     56: ("Congo - Brazzaville",                          "CG"),
+     57: ("Congo - Kinshasa",                             "CD"),
      58: ("Cook Islands",                                 "CK"),
      59: ("Costa Rica",                                   "CR"),
      60: ("Croatia",                                      "HR"),
@@ -508,7 +508,7 @@ territory_map = {
      98: ("Guam",                                         "GU"),
      99: ("Guatemala",                                    "GT"),
     100: ("Guernsey",                                     "GG"),
-    101: ("Guinea Bissau",                                "GW"),
+    101: ("Guinea-Bissau",                                "GW"),
     102: ("Guinea",                                       "GN"),
     103: ("Guyana",                                       "GY"),
     104: ("Haiti",                                        "HT"),
@@ -522,7 +522,7 @@ territory_map = {
     112: ("Iran",                                         "IR"),
     113: ("Iraq",                                         "IQ"),
     114: ("Ireland",                                      "IE"),
-    115: ("Isle Of Man",                                  "IM"),
+    115: ("Isle of Man",                                  "IM"),
     116: ("Israel",                                       "IL"),
     117: ("Italy",                                        "IT"),
       # Officially Côte d’Ivoire, which we'd ned to map to CotedIvoire
@@ -647,7 +647,7 @@ territory_map = {
     234: ("Tokelau",                                      "TK"),
     235: ("Tonga",                                        "TO"),
     236: ("Trinidad And Tobago",                          "TT"),
-    237: ("Tristan Da Cunha",                             "TA"),
+    237: ("Tristan da Cunha",                             "TA"),
     238: ("Tunisia",                                      "TN"),
     239: ("Turkey",                                       "TR"),
     240: ("Turkmenistan",                                 "TM"),
@@ -668,7 +668,7 @@ territory_map = {
     255: ("Vietnam",                                      "VN"),
     256: ("Wallis And Futuna",                            "WF"),
     257: ("Western Sahara",                               "EH"),
-    258: ("World",                                        "001"),
+    258: ("world",                                        "001"),
     259: ("Yemen",                                        "YE"),
     260: ("Zambia",                                       "ZM"),
     261: ("Zimbabwe",                                     "ZW"),
@@ -738,7 +738,7 @@ script_map = {
      28: ("Deseret",                "Dsrt"),
      29: ("Devanagari",             "Deva"),
      30: ("Duployan",               "Dupl"),
-     31: ("Egyptian Hieroglyphs",   "Egyp"),
+     31: ("Egyptian hieroglyphs",   "Egyp"),
      32: ("Elbasan",                "Elba"),
      33: ("Ethiopic",               "Ethi"),
      34: ("Fraser",                 "Lisu"),
@@ -813,7 +813,7 @@ script_map = {
     103: ("Pahawh Hmong",           "Hmng"),
     104: ("Palmyrene",              "Palm"),
     105: ("Pau Cin Hau",            "Pauc"),
-    106: ("Phags Pa",               "Phag"),
+    106: ("Phags-pa",               "Phag"),
     107: ("Phoenician",             "Phnx"),
     108: ("Pollard Phonetic",       "Plrd"),
     109: ("Psalter Pahlavi",        "Phlp"),
@@ -824,7 +824,7 @@ script_map = {
     114: ("Sharada",                "Shrd"),
     115: ("Shavian",                "Shaw"),
     116: ("Siddham",                "Sidd"),
-    117: ("Sign Writing",           "Sgnw"),
+    117: ("SignWriting",            "Sgnw"), # Oddly, en.xml leaves no space in it.
     118: ("Simplified Han",         "Hans"),
     119: ("Sinhala",                "Sinh"),
     120: ("Sora Sompeng",           "Sora"),