From 5a4ac873b379553f779b33993aeeaec9a009560b Mon Sep 17 00:00:00 2001
From: Conrad Nied <conrad.logos@gmail.com>
Date: Mon, 9 Sep 2024 17:02:54 -0700
Subject: [PATCH] CLDR-17897 Keep Chinese defaults

---
 common/supplemental/likelySubtags.xml                       | 6 +++---
 common/supplemental/supplementalData.xml                    | 2 +-
 .../java/org/unicode/cldr/tool/GenerateLikelySubtags.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 016b0cb2e87..ce4e105a831 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -501,9 +501,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="myz" to="myz_Mand_IR"/>		<!--Classical Mandaic‧?‧?	➡ Classical Mandaic‧Mandaean‧Iran-->
 		<likelySubtag from="mzn" to="mzn_Arab_IR"/>		<!--Mazanderani‧?‧?	➡ Mazanderani‧Arabic‧Iran-->
 		<likelySubtag from="na" to="na_Latn_NR"/>		<!--Nauru‧?‧?	➡ Nauru‧Latin‧Nauru-->
-		<likelySubtag from="nan" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Traditional‧Taiwan-->
-		<likelySubtag from="nan_CN" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧?‧China	➡ Min Nan Chinese‧Simplified‧China-->
-		<likelySubtag from="nan_Hans" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧Simplified‧?	➡ Min Nan Chinese‧Simplified‧China-->
+		<likelySubtag from="nan" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Simplified‧China-->
+		<likelySubtag from="nan_TW" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧?‧Taiwan	➡ Min Nan Chinese‧Traditional‧Taiwan-->
+		<likelySubtag from="nan_Hant" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧Traditional‧?	➡ Min Nan Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="nap" to="nap_Latn_IT"/>		<!--Neapolitan‧?‧?	➡ Neapolitan‧Latin‧Italy-->
 		<likelySubtag from="naq" to="naq_Latn_NA"/>		<!--Nama‧?‧?	➡ Nama‧Latin‧Namibia-->
 		<likelySubtag from="nb" to="nb_Latn_NO"/>		<!--Norwegian Bokmål‧?‧?	➡ Norwegian Bokmål‧Latin‧Norway-->
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index c130a81d544..b2543a99237 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -2801,7 +2801,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="yue_Hans" writingPercent="5" populationPercent="5.2" references="R1328"/>	<!--Cantonese (Simplified)-->
 			<languagePopulation type="hsn" populationPercent="2.9"/>	<!--Xiang Chinese-->
 			<languagePopulation type="hak" populationPercent="2.3"/>	<!--Hakka Chinese-->
-			<languagePopulation type="nan_Hans" populationPercent="1.9"/>	<!--Min Nan Chinese (Simplified)-->
+			<languagePopulation type="nan" populationPercent="1.9"/>	<!--Min Nan Chinese-->
 			<languagePopulation type="gan" populationPercent="1.7"/>	<!--Gan Chinese-->
 			<languagePopulation type="ii" literacyPercent="60" populationPercent="0.6"/>	<!--Sichuan Yi-->
 			<languagePopulation type="ug" populationPercent="0.55" officialStatus="official_regional"/>	<!--Uyghur-->
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java
index 3e455f31322..b14bfbb81d3 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java
@@ -392,7 +392,7 @@ public static void main(String[] args) throws IOException {
                                 {"mro", "mro_Mroo_BD"},
                                 {"mro_BD", "mro_Mroo_BD"},
                                 {"ms_Arab", "ms_Arab_MY"},
-                                {"nan", "nan_Hant_TW"},
+                                {"nan", "nan_Hans_CN"},
                                 {"nan_Hant", "nan_Hant_TW"},
                                 {"nan_Hans", "nan_Hans_CN"},
                                 {"nan_TW", "nan_Hant_TW"},