From a1ea8534964e5c4d2a304875b58857760ae3a3d9 Mon Sep 17 00:00:00 2001
From: Conrad Nied <conrad.logos@gmail.com>
Date: Tue, 14 Jan 2025 16:12:30 -0800
Subject: [PATCH] CLDR-18155 Fix Mandingo / Nkoo population

Ah, even if Nko is a minority script it still has to be regarded as the highest with other data we have.
---
 common/supplemental/likelySubtags.xml                       | 4 ++--
 common/supplemental/supplementalData.xml                    | 5 +++--
 common/testData/localeIdentifiers/likelySubtags.txt         | 6 +++---
 .../unicode/cldr/util/data/country_language_population.tsv  | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 8ee759030c2..f0180b97435 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -451,6 +451,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mai" to="mai_Deva_IN"/>		<!--Maithili‧?‧?	➡ Maithili‧Devanagari‧India-->
 		<likelySubtag from="mak" to="mak_Latn_ID"/>		<!--Makasar‧?‧?	➡ Makasar‧Latin‧Indonesia-->
 		<likelySubtag from="man" to="man_Latn_GM"/>		<!--Mandingo‧?‧?	➡ Mandingo‧Latin‧Gambia-->
+		<likelySubtag from="man_GN" to="man_Nkoo_GN"/>		<!--Mandingo‧?‧Guinea	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="man_Nkoo" to="man_Nkoo_GN"/>		<!--Mandingo‧N’Ko‧?	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="mas" to="mas_Latn_KE"/>		<!--Masai‧?‧?	➡ Masai‧Latin‧Kenya-->
 		<likelySubtag from="maz" to="maz_Latn_MX"/>		<!--Central Mazahua‧?‧?	➡ Central Mazahua‧Latin‧Mexico-->
@@ -1253,8 +1254,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Narb" to="xna_Narb_SA"/>		<!--?‧Old North Arabian‧?	➡ Ancient North Arabian‧Old North Arabian‧Saudi Arabia-->
 		<likelySubtag from="und_Nbat" to="arc_Nbat_JO"/>		<!--?‧Nabataean‧?	➡ Aramaic‧Nabataean‧Jordan-->
 		<likelySubtag from="und_Newa" to="new_Newa_NP"/>		<!--?‧Newa‧?	➡ Newari‧Newa‧Nepal-->
-		<likelySubtag from="und_Nkoo" to="nqo_Nkoo_GN"/>		<!--?‧N’Ko‧?	➡ N’Ko‧N’Ko‧Guinea-->
-		<likelySubtag from="und_Nkoo_GM" to="man_Nkoo_GM"/>		<!--?‧N’Ko‧Gambia	➡ Mandingo‧N’Ko‧Gambia-->
+		<likelySubtag from="und_Nkoo" to="man_Nkoo_GN"/>		<!--?‧N’Ko‧?	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="und_Nkoo_ML" to="bm_Nkoo_ML"/>		<!--?‧N’Ko‧Mali	➡ Bambara‧N’Ko‧Mali-->
 		<likelySubtag from="und_Nshu" to="zhx_Nshu_CN"/>		<!--?‧Nüshu‧?	➡ Chinese (family)‧Nüshu‧China-->
 		<likelySubtag from="und_Ogam" to="sga_Ogam_IE"/>		<!--?‧Ogham‧?	➡ Old Irish‧Ogham‧Ireland-->
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 25a6bce95cc..95665e64e04 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -3141,7 +3141,7 @@ XXX Code for transations where no currency is involved
 		<territory type="GM" gdp="7905000000" literacyPercent="51.1" population="2523330">	<!--Gambia-->
 			<languagePopulation type="en" populationPercent="40" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="man" populationPercent="29"/>	<!--Mandingo-->
-			<languagePopulation type="man_Nkoo" writingPercent="5" populationPercent="29" references="R1021"/>	<!--Mandingo (N’Ko)-->
+			<languagePopulation type="man_Nkoo" writingPercent="5" populationPercent="29" references="R1023"/>	<!--Mandingo (N’Ko)-->
 			<languagePopulation type="ff" populationPercent="0"/>	<!--Fula-->
 			<languagePopulation type="ff_Adlm" populationPercent="0"/>	<!--Fula (Adlam)-->
 		</territory>
@@ -3149,7 +3149,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="fr" populationPercent="27" officialStatus="official" references="R1352"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="26"/>	<!--Fula-->
 			<languagePopulation type="man" populationPercent="23"/>	<!--Mandingo-->
-			<languagePopulation type="man_Nkoo" writingPercent="5" populationPercent="23" references="R1021"/>	<!--Mandingo (N’Ko)-->
+			<languagePopulation type="man_Nkoo" literacyPercent="50" populationPercent="23" references="R1021"/>	<!--Mandingo (N’Ko)-->
 			<languagePopulation type="sus" populationPercent="11"/>	<!--Susu-->
 			<languagePopulation type="nqo" populationPercent="5" references="R1286"/>	<!--N’Ko-->
 			<languagePopulation type="kpe" populationPercent="3.8"/>	<!--Kpelle-->
@@ -5557,6 +5557,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1020" uri="http://en.wikipedia.org/wiki/Ascension_Island">[missing]</reference>
 		<reference type="R1021">Actually literacy in Nko writing unknown but historically they used the Latin script</reference>
 		<reference type="R1022" uri="https://www.cia.gov/cia/publications/factbook/geos/gi.html">English official, the figure is derived from literacy * lang pop</reference>
+		<reference type="R1023">Actually literacy in Nko writing unknown</reference>
 		<reference type="R1024" uri="http://www.ethnologue.com/show_language.asp?code=ltz">Some 99% of users are literate in French or German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1025" uri="http://www.ethnologue.com/language/ewo">2nd lang literacy 15-25%</reference>
 		<reference type="R1026" uri="http://www.ethnologue.com/show_language.asp?code=lim">Nearly all speakers are literate in a 2nd language. For languages not customarily written, the writing population is artificially set to 5%</reference>
diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt
index cd9cfed8fc2..4b9d59049bb 100644
--- a/common/testData/localeIdentifiers/likelySubtags.txt
+++ b/common/testData/localeIdentifiers/likelySubtags.txt
@@ -1575,9 +1575,9 @@ und-NP ;	ne-Deva-NP ;	ne ;
 und-NR ;	en-Latn-NR ;	en-NR ;	
 und-NU ;	en-Latn-NU ;	en-NU ;	
 und-NZ ;	en-Latn-NZ ;	en-NZ ;	
-und-Nkoo ;	nqo-Nkoo-GN ;	nqo ;	
-und-Nkoo-AQ ;	nqo-Nkoo-AQ ;	nqo-AQ ;	
-und-Nkoo-GN ;	nqo-Nkoo-GN ;	nqo ;	
+und-Nkoo ;	man-Nkoo-GN ;	man-Nkoo ;	man-GN
+und-Nkoo-AQ ;	man-Nkoo-AQ ;	 ;	
+und-Nkoo-GN ;	man-Nkoo-GN ;	man-Nkoo ;	man-GN
 und-OM ;	ar-Arab-OM ;	ar-OM ;	
 und-Olck ;	sat-Olck-IN ;	sat ;	
 und-Olck-AQ ;	sat-Olck-AQ ;	sat-AQ ;	
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 2155b596d52..f0fb1df2b00 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
@@ -434,7 +434,7 @@ Gambia	GM	"2,092,731"	51%	"5,556,000,000"	official	English	en	40%
 Gambia	GM	"2,092,731"	51%	"5,556,000,000"		Fulah	ff	1
 Gambia	GM	"2,092,731"	51%	"5,556,000,000"		Fulah (Adlam)	ff_Adlm	1
 Gambia	GM	"2,092,731"	51%	"5,556,000,000"		Mandingo	man_Latn	29%
-Gambia	GM	"2,092,731"	51%	"5,556,000,000"		Mandingo (Nko)	man_Nkoo	29%	5%		Actually literacy in Nko writing unknown but historically they used the Latin script
+Gambia	GM	"2,092,731"	51%	"5,556,000,000"		Mandingo (Nko)	man_Nkoo	29%	5%		Actually literacy in Nko writing unknown
 Georgia	GE	"4,926,087"	100%	"39,850,000,000"	official_regional	Abkhazian	ab	"110,000"
 Georgia	GE	"4,926,087"	100%	"39,850,000,000"		Armenian	hy	7%			https://www.cia.gov/cia/publications/factbook/fields/2098.html
 Georgia	GE	"4,926,087"	100%	"39,850,000,000"	official	Georgian	ka	86%
@@ -508,7 +508,7 @@ Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Fulah	ff	26%
 Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Fulah (Adlam)	ff_Adlm	1			No Data Available at present.
 Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Kpelle	kpe	3.8%
 Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Mandingo	man	23%
-Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Mandingo (N’Ko)	man_Nkoo	23%	5%		Actually literacy in Nko writing unknown but historically they used the Latin script
+Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Mandingo (N’Ko)	man_Nkoo	23%	25%		Actually literacy in Nko writing unknown but historically they used the Latin script
 Guinea	GN	"11,855,411"	41%	"27,970,000,000"		N’Ko	nqo	5%			No figures available for this language.  Estimating at 5%.
 Guinea	GN	"11,855,411"	41%	"27,970,000,000"		Susu	sus	11%
 Guinea-Bissau	GW	"1,833,247"	55%	"3,171,000,000"		Fulah	ff	1			No estimate available.