Skip to content

Commit f03fd8c

Browse files
conradarcturusconradarcturus
committed
CLDR-18155 Recommended edits
1 parent f14ddb5 commit f03fd8c

File tree

6 files changed

+27
-26
lines changed

6 files changed

+27
-26
lines changed

‎common/supplemental/likelySubtags.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
451451
<likelySubtag from="mai" to="mai_Deva_IN"/> <!--Maithili‧?‧? ➡ Maithili‧Devanagari‧India-->
452452
<likelySubtag from="mak" to="mak_Latn_ID"/> <!--Makasar‧?‧? ➡ Makasar‧Latin‧Indonesia-->
453453
<likelySubtag from="man" to="man_Latn_GM"/> <!--Mandingo‧?‧? ➡ Mandingo‧Latin‧Gambia-->
454-
<likelySubtag from="man_GN" to="man_Nkoo_GN"/> <!--Mandingo‧?‧Guinea ➡ Mandingo‧N’Ko‧Guinea-->
455454
<likelySubtag from="man_Nkoo" to="man_Nkoo_GN"/> <!--Mandingo‧N’Ko‧? ➡ Mandingo‧N’Ko‧Guinea-->
456455
<likelySubtag from="mas" to="mas_Latn_KE"/> <!--Masai‧?‧? ➡ Masai‧Latin‧Kenya-->
457456
<likelySubtag from="maz" to="maz_Latn_MX"/> <!--Central Mazahua‧?‧? ➡ Central Mazahua‧Latin‧Mexico-->
@@ -1254,7 +1253,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
12541253
<likelySubtag from="und_Narb" to="xna_Narb_SA"/> <!--?‧Old North Arabian‧? ➡ Ancient North Arabian‧Old North Arabian‧Saudi Arabia-->
12551254
<likelySubtag from="und_Nbat" to="arc_Nbat_JO"/> <!--?‧Nabataean‧? ➡ Aramaic‧Nabataean‧Jordan-->
12561255
<likelySubtag from="und_Newa" to="new_Newa_NP"/> <!--?‧Newa‧? ➡ Newari‧Newa‧Nepal-->
1257-
<likelySubtag from="und_Nkoo" to="man_Nkoo_GN"/> <!--?‧N’Ko‧? ➡ Mandingo‧N’Ko‧Guinea-->
1256+
<likelySubtag from="und_Nkoo" to="nqo_Nkoo_GN"/> <!--?‧N’Ko‧? ➡ N’Ko‧N’Ko‧Guinea-->
1257+
<likelySubtag from="und_Nkoo_GM" to="man_Nkoo_GM"/> <!--?‧N’Ko‧Gambia ➡ Mandingo‧N’Ko‧Gambia-->
12581258
<likelySubtag from="und_Nkoo_ML" to="bm_Nkoo_ML"/> <!--?‧N’Ko‧Mali ➡ Bambara‧N’Ko‧Mali-->
12591259
<likelySubtag from="und_Nshu" to="zhx_Nshu_CN"/> <!--?‧Nüshu‧? ➡ Chinese (family)‧Nüshu‧China-->
12601260
<likelySubtag from="und_Ogam" to="sga_Ogam_IE"/> <!--?‧Ogham‧? ➡ Old Irish‧Ogham‧Ireland-->

‎common/supplemental/supplementalData.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ XXX Code for transations where no currency is involved
19181918
<language type="mai" scripts="Tirh" territories="IN NP" alt="secondary"/>
19191919
<language type="mak" scripts="Latn"/>
19201920
<language type="mak" scripts="Bugi" territories="ID" alt="secondary"/>
1921-
<language type="man" scripts="Nkoo Latn"/>
1921+
<language type="man" scripts="Latn Nkoo"/>
19221922
<language type="man" territories="GM GN" alt="secondary"/>
19231923
<language type="mas" scripts="Latn"/>
19241924
<language type="maz" scripts="Latn"/>
@@ -3147,7 +3147,8 @@ XXX Code for transations where no currency is involved
31473147
<territory type="GN" gdp="56660000000" literacyPercent="41" population="13986200"> <!--Guinea-->
31483148
<languagePopulation type="fr" populationPercent="27" officialStatus="official" references="R1352"/> <!--French-->
31493149
<languagePopulation type="ff" populationPercent="26"/> <!--Fula-->
3150-
<languagePopulation type="man_Nkoo" populationPercent="23"/> <!--Mandingo (N’Ko)-->
3150+
<languagePopulation type="man" populationPercent="23"/> <!--Mandingo-->
3151+
<languagePopulation type="man_Nkoo" writingPercent="5" populationPercent="23" references="R1021"/> <!--Mandingo (N’Ko)-->
31513152
<languagePopulation type="sus" populationPercent="11"/> <!--Susu-->
31523153
<languagePopulation type="nqo" populationPercent="5" references="R1286"/> <!--N’Ko-->
31533154
<languagePopulation type="kpe" populationPercent="3.8"/> <!--Kpelle-->

‎common/testData/localeIdentifiers/likelySubtags.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1575,9 +1575,9 @@ und-NP ; ne-Deva-NP ; ne ;
15751575
und-NR ; en-Latn-NR ; en-NR ;
15761576
und-NU ; en-Latn-NU ; en-NU ;
15771577
und-NZ ; en-Latn-NZ ; en-NZ ;
1578-
und-Nkoo ; man-Nkoo-GN ; man-Nkoo ; man-GN
1579-
und-Nkoo-AQ ; man-Nkoo-AQ ; ;
1580-
und-Nkoo-GN ; man-Nkoo-GN ; man-Nkoo ; man-GN
1578+
und-Nkoo ; nqo-Nkoo-GN ; nqo ;
1579+
und-Nkoo-AQ ; nqo-Nkoo-AQ ; nqo-AQ ;
1580+
und-Nkoo-GN ; nqo-Nkoo-GN ; nqo ;
15811581
und-OM ; ar-Arab-OM ; ar-OM ;
15821582
und-Olck ; sat-Olck-IN ; sat ;
15831583
und-Olck-AQ ; sat-Olck-AQ ; sat-AQ ;

‎tools/cldr-code/src/main/java/org/unicode/cldr/util/DiffLanguageGroups.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public static Set<String> getAllKeysAndValues(Map<String, String> newItems) {
356356
private static boolean handleLanguageGroups(
357357
String value, XPathParts parts, Multimap<String, String> languageGroups) {
358358
String parent = parts.getAttributeValue(-1, "parent");
359-
List<String> children = SupplementalDataInfo.WHITESPACE_SPLTTER.splitToList(value);
359+
List<String> children = SupplementalDataInfo.WHITESPACE_SPLITTER.splitToList(value);
360360
languageGroups.putAll(parent, children);
361361
return true;
362362
}

‎tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java

+16-17
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ public PopulationData setWritingPopulation(double writingPopulation) {
318318
}
319319
}
320320

321-
static final Pattern WHITESPACE_PATTERN = PatternCache.get("\\s+");
322-
323321
/** Simple language/script/region information */
324322
public static class BasicLanguageData
325323
implements Comparable<BasicLanguageData>,
@@ -349,18 +347,17 @@ public BasicLanguageData setType(Type type) {
349347
// Adding scripts but leaving 0 as a placeholder when there is no population data
350348
// input: a whitespace-separated list of scripts
351349
public BasicLanguageData setScriptsWithoutPopulation(String scriptTokens) {
352-
List<String> scripts = new ArrayList<>();
353-
if (scriptTokens != null) {
354-
scripts = Arrays.asList(WHITESPACE_PATTERN.split(scriptTokens));
355-
}
356-
return setScriptsWithoutPopulation(scripts);
350+
return setScriptsWithoutPopulation(
351+
scriptTokens == null ? null : WHITESPACE_SPLITTER.splitToList(scriptTokens));
357352
}
358353

359354
// Adding scripts but leaving 0 as a placeholder when there is no population data
360355
public BasicLanguageData setScriptsWithoutPopulation(Collection<String> scripts) {
361356
Map<String, Integer> scriptsByPopulation = new TreeMap<>();
362-
for (String script : scripts) {
363-
scriptsByPopulation.put(script, 0);
357+
if (scripts != null) {
358+
for (String script : scripts) {
359+
scriptsByPopulation.put(script, 0);
360+
}
364361
}
365362
return setScripts(scriptsByPopulation);
366363
}
@@ -369,7 +366,7 @@ public BasicLanguageData setTerritories(String territoryTokens) {
369366
return setTerritories(
370367
territoryTokens == null
371368
? null
372-
: Arrays.asList(WHITESPACE_PATTERN.split(territoryTokens)));
369+
: WHITESPACE_SPLITTER.splitToList(territoryTokens));
373370
}
374371

375372
public BasicLanguageData setScripts(Map<String, Integer> newScripts) {
@@ -379,7 +376,9 @@ public BasicLanguageData setScripts(Map<String, Integer> newScripts) {
379376
// TODO add error checking
380377
scripts = Collections.emptySet();
381378
scriptsByPopulation = new TreeMap<>();
382-
addScripts(newScripts);
379+
if (newScripts != null) {
380+
addScripts(newScripts);
381+
}
383382
return this;
384383
}
385384

@@ -1686,7 +1685,7 @@ private boolean handleUnitPreferences(XPathValue parts, String value) {
16861685

16871686
private boolean handleLanguageGroups(String value, XPathValue parts) {
16881687
String parent = parts.getAttributeValue(-1, "parent");
1689-
List<String> children = WHITESPACE_SPLTTER.splitToList(value);
1688+
List<String> children = WHITESPACE_SPLITTER.splitToList(value);
16901689
languageGroups.putAll(parent, children);
16911690
return true;
16921691
}
@@ -1862,7 +1861,7 @@ private boolean handleLanguageMatcher(XPathValue parts) {
18621861
switch (parts.getElement(3)) {
18631862
case "paradigmLocales":
18641863
List<String> locales =
1865-
WHITESPACE_SPLTTER.splitToList(parts.getAttributeValue(3, "locales"));
1864+
WHITESPACE_SPLITTER.splitToList(parts.getAttributeValue(3, "locales"));
18661865
// TODO
18671866
// LanguageMatchData languageMatchData =
18681867
// languageMatchData.get(type);
@@ -5107,7 +5106,7 @@ public File getDirectory() {
51075106
return directory;
51085107
}
51095108

5110-
public static final Splitter WHITESPACE_SPLTTER =
5109+
public static final Splitter WHITESPACE_SPLITTER =
51115110
Splitter.on(PatternCache.get("\\s+")).omitEmptyStrings();
51125111

51135112
public static final class AttributeValidityInfo {
@@ -5155,7 +5154,7 @@ public AttributeValidityInfo(
51555154
this.dtds = Collections.singleton(DtdType.ldml);
51565155
} else {
51575156
Set<DtdType> temp = EnumSet.noneOf(DtdType.class);
5158-
for (String s : WHITESPACE_SPLTTER.split(dtds)) {
5157+
for (String s : WHITESPACE_SPLITTER.split(dtds)) {
51595158
temp.add(DtdType.fromElement(s));
51605159
}
51615160
this.dtds = Collections.unmodifiableSet(temp);
@@ -5164,10 +5163,10 @@ public AttributeValidityInfo(
51645163
this.elements =
51655164
elements == null
51665165
? Collections.EMPTY_SET
5167-
: With.in(WHITESPACE_SPLTTER.split(elements))
5166+
: With.in(WHITESPACE_SPLITTER.split(elements))
51685167
.toUnmodifiableCollection(new HashSet<String>());
51695168
this.attributes =
5170-
With.in(WHITESPACE_SPLTTER.split(attributes))
5169+
With.in(WHITESPACE_SPLITTER.split(attributes))
51715170
.toUnmodifiableCollection(new HashSet<String>());
51725171
this.order = order;
51735172
}

‎tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv

+2-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@ Guinea GN "11,855,411" 41% "27,970,000,000" official French fr 27.2% https://o
507507
Guinea GN "11,855,411" 41% "27,970,000,000" Fulah ff 26%
508508
Guinea GN "11,855,411" 41% "27,970,000,000" Fulah (Adlam) ff_Adlm 1 No Data Available at present.
509509
Guinea GN "11,855,411" 41% "27,970,000,000" Kpelle kpe 3.8%
510-
Guinea GN "11,855,411" 41% "27,970,000,000" Mandingo (N’Ko) man_Nkoo 23%
510+
Guinea GN "11,855,411" 41% "27,970,000,000" Mandingo man 23%
511+
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
511512
Guinea GN "11,855,411" 41% "27,970,000,000" N’Ko nqo 5% No figures available for this language. Estimating at 5%.
512513
Guinea GN "11,855,411" 41% "27,970,000,000" Susu sus 11%
513514
Guinea-Bissau GW "1,833,247" 55% "3,171,000,000" Fulah ff 1 No estimate available.

0 commit comments

Comments
 (0)