From 8dd134fafa5097dcf36324d82b3b86ac3664ad8e Mon Sep 17 00:00:00 2001
From: Conrad Nied <conrad.logos@gmail.com>
Date: Wed, 4 Sep 2024 09:55:37 -0700
Subject: [PATCH] CLDR-17897 Update Chinese tags

---
 common/supplemental/supplementalData.xml                     | 4 ++--
 .../java/org/unicode/cldr/tool/GenerateLikelySubtags.java    | 5 +++++
 .../unicode/cldr/util/data/country_language_population.tsv   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 5d09af73a59..c130a81d544 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" populationPercent="1.9"/>	<!--Min Nan Chinese-->
+			<languagePopulation type="nan_Hans" populationPercent="1.9"/>	<!--Min Nan Chinese (Simplified)-->
 			<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-->
@@ -4263,7 +4263,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="TW" gdp="1143000000000" literacyPercent="96.1" population="23595300">	<!--Taiwan-->
 			<languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>	<!--Chinese (Traditional)-->
-			<languagePopulation type="nan_Hant" populationPercent="57" officialStatus="official" references="R1219"/>	<!--Min Nan Chinese (Traditional)-->
+			<languagePopulation type="nan" populationPercent="57" officialStatus="official" references="R1219"/>	<!--Min Nan Chinese-->
 			<languagePopulation type="hak_Hant" populationPercent="11" officialStatus="official" references="R1333"/>	<!--Hakka Chinese (Traditional)-->
 			<languagePopulation type="trv" populationPercent="0.02"/>	<!--Taroko-->
 		</territory>
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 850a81889e8..3e455f31322 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,6 +392,10 @@ 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_Hant", "nan_Hant_TW"},
+                                {"nan_Hans", "nan_Hans_CN"},
+                                {"nan_TW", "nan_Hant_TW"},
                                 {"pap", "pap_Latn_CW"},
                                 {"pap_Latn", "pap_Latn_CW"},
                                 {
@@ -514,6 +518,7 @@ public static void main(String[] args) throws IOException {
                                 {"und_Cyrl_RS", "sr_Cyrl_RS"},
                                 {"und_Cyrl_TJ", "tg_Cyrl_TJ"},
                                 {"und_Cyrl_UA", "uk_Cyrl_UA"},
+                                {"und_Hans_TW", "zh_Hans_TW"},
                                 {"arc_Hatr", "arc_Hatr_IQ"},
                                 {"hnj_Hmng", "hnj_Hmng_LA"},
                                 {"bap_Krai", "bap_Krai_IN"},
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
index a54bd621635..8fef5e5d7ae 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
@@ -1292,7 +1292,7 @@ Syria	SY	"19,454,263"	84%	"50,280,000,000"		Kurdish	ku	8%
 Syria	SY	"19,454,263"	84%	"50,280,000,000"		Syriac	syr	"16,400"	5%		"For languages not customarily written, the writing population is artificially set to 5% in the absence of better information."
 Syria	SY	"19,454,263"	84%	"50,280,000,000"		Levantine Arabic	apc	"16,633,300"			https://en.wikipedia.org/wiki/Levantine_Arabic#Speakers_by_country
 Taiwan	TW	"23,545,963"	96%	"1,189,000,000,000"	official	Chinese (Traditional)	zh_Hant	95%
-Taiwan	TW	"23,545,963"	96%	"1,189,000,000,000"	official	Hokkien	nan_Hant	"13,500,000"			https://en.wikipedia.org/wiki/Taiwanese_Hokkien
+Taiwan	TW	"23,545,963"	96%	"1,189,000,000,000"	official	Hokkien	nan	"13,500,000"			https://en.wikipedia.org/wiki/Taiwanese_Hokkien
 Taiwan	TW	"23,545,963"	96%	"1,189,000,000,000"	official	Hakka	hak_Hant	"2,580,000"			https://en.wikipedia.org/wiki/Taiwanese_Hakka
 Taiwan	TW	"23,545,963"	96%	"1,189,000,000,000"		Taroko	trv	"4,750"
 Tajikistan	TJ	"8,604,882"	100%	"28,430,000,000"		Arabic	ar	"1,000"