CLDR-18099 Add language inheritance

CLDR-18099 Add language inheritance for new locales
unicode-org · AEApple · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
commit 3162ea6ae406023ee018e4948531925a5d31fcf7
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
@@ -5507,7 +5507,7 @@ XXX Code for transations where no currency is involved
 	<parentLocales>
 		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kaa_Latn kk_Arab kok_Latn ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
 		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GS en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
-		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
+		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_ES en_FI en_FR en_IT en_NL en_NO en_SE en_SI en_SK"/>
 		<parentLocale parent="en_IN" locales="hi_Latn"/>
 		<parentLocale parent="es_419" locales="es_AR es_BO es_BR es_BZ es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_JP es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
 		<parentLocale parent="fr_HT" locales="ht"/>

diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java
        }

        if (!collectedBad.isEmpty()) {
            warnln(
                    "Locales have "
                            + collectedBad.size()
                            + " unexpected characters in main and/or aux:\t"
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java
                if (logKnownIssue("CLDR-16394", "slightly out of order")) {
                    errorType = WARN;
                }
                msg(
                        "Out of order: "
                                + lastEmoji
                                + " ("
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAttributeValues.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAttributeValues.java
        void show(DtdType dtdType, boolean verbose, ImmutableSet<ValueStatus> retain) {
            if (dtdData.dtdType == DtdType.keyboard3
                    && testLog.logKnownIssue("CLDR-14974", "skipping for keyboard")) {
                testLog.warnln("keyboard3 is missing validity checks");
            }
            boolean haveProblems = false;
            for (ValueStatus valueStatus : ValueStatus.values()) {
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java
            }
            String value = swissHighGerman.getStringValue(xpath);
            if (value != null && value.indexOf('ß') >= 0) {
                warnln("«" + value + "» contains ß at " + xpath);
            }
        }
    }
	}

	if (!collectedBad.isEmpty()) {
	warnln(
Check warning on line 563 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java GitHub Actions / build `(LikelySubtagsTest.java:563) Warning: Locales have 220 unexpected characters in main and/or aux: [҂״܀-܍०-९৲-৺੦-੯૰౦-౯໐-໙၀-၉၏႐-႙႞႟፠-፼᎐-᎙᠐-᠙⳥-⳪꒐-꓆𞅏{a\:}{ch’}{e\:}{i\:}{k’}{o\:}{ts’}{tł’}{t’}{à\:}{á\:}{è\:}{é\:}{ì\:}{í\:}{ò\:}{ó\:}{ଅ\:}{ଆ\:}{ଏ\:}]` Check warning on line 563 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java GitHub Actions / build `(LikelySubtagsTest.java:563) Warning: Locales have 220 unexpected characters in main and/or aux: [҂״܀-܍०-९৲-৺੦-੯૰౦-౯໐-໙၀-၉၏႐-႙႞႟፠-፼᎐-᎙᠐-᠙⳥-⳪꒐-꓆𞅏{a\:}{ch’}{e\:}{i\:}{k’}{o\:}{ts’}{tł’}{t’}{à\:}{á\:}{è\:}{é\:}{ì\:}{í\:}{ò\:}{ó\:}{ଅ\:}{ଆ\:}{ଏ\:}]`
	"Locales have "
	+ collectedBad.size()
	+ " unexpected characters in main and/or aux:\t"
	if (logKnownIssue("CLDR-16394", "slightly out of order")) {
	errorType = WARN;
	}
	msg(
Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 🧔‍♀ (57700) woman: beard > 👩 (61200) woman` Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 👱‍♀ (66700) woman: blond hair > 👱‍♂ (67900) man: blond hair` Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 🫆 (347500) fingerprint > 🏻 (347600) light skin tone` Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 🧔‍♀ (57700) woman: beard > 👩 (61200) woman` Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 👱‍♀ (66700) woman: blond hair > 👱‍♂ (67900) man: blond hair` Check warning on line 449 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAnnotations.java GitHub Actions / build `(TestAnnotations.java:449) Warning: Out of order: 🫆 (347500) fingerprint > 🏻 (347600) light skin tone`
	"Out of order: "
	+ lastEmoji
	+ " ("
	void show(DtdType dtdType, boolean verbose, ImmutableSet<ValueStatus> retain) {
	if (dtdData.dtdType == DtdType.keyboard3
	&& testLog.logKnownIssue("CLDR-14974", "skipping for keyboard")) {
	testLog.warnln("keyboard3 is missing validity checks");
Check warning on line 312 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAttributeValues.java GitHub Actions / build `(TestAttributeValues.java:312) Warning: keyboard3 is missing validity checks` Check warning on line 312 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestAttributeValues.java GitHub Actions / build `(TestAttributeValues.java:312) Warning: keyboard3 is missing validity checks`
	}
	boolean haveProblems = false;
	for (ValueStatus valueStatus : ValueStatus.values()) {
	}
	String value = swissHighGerman.getStringValue(xpath);
	if (value != null && value.indexOf('ß') >= 0) {
	warnln("«" + value + "» contains ß at " + xpath);
Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Deko \| Emotion \| Gefühl \| Herz \| Herzdekoration \| Liebe \| lila \| violett \| weiß» contains ß at //ldml/annotations/annotation[@cp="💟"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Emotion \| Gefühl \| Herz \| Herzen \| Hochzeitstag \| Jahrestag \| kreisen \| Liebe \| süß» contains ß at //ldml/annotations/annotation[@cp="💞"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «alt \| älter \| erwachsen \| Großeltern \| Mensch \| Person \| weise» contains ß at //ldml/annotations/annotation[@cp="🧓"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «aquamarin \| Emotion \| gefallen \| gefällt \| Gefühl \| hdl \| hellblau \| Herz \| Liebe \| mag \| mögen \| niedlich \| süß \| türkis \| zyan» contains ß at //ldml/annotations/annotation[@cp="🩵"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Gesicht \| keine Ahnung \| Smiley \| traurig \| verwirrt \| verwundert \| weiß nicht» contains ß at //ldml/annotations/annotation[@cp="😕"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Deko \| Emotion \| Gefühl \| Herz \| Herzdekoration \| Liebe \| lila \| violett \| weiß» contains ß at //ldml/annotations/annotation[@cp="💟"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Emotion \| Gefühl \| Herz \| Herzen \| Hochzeitstag \| Jahrestag \| kreisen \| Liebe \| süß» contains ß at //ldml/annotations/annotation[@cp="💞"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «alt \| älter \| erwachsen \| Großeltern \| Mensch \| Person \| weise» contains ß at //ldml/annotations/annotation[@cp="🧓"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «aquamarin \| Emotion \| gefallen \| gefällt \| Gefühl \| hdl \| hellblau \| Herz \| Liebe \| mag \| mögen \| niedlich \| süß \| türkis \| zyan» contains ß at //ldml/annotations/annotation[@cp="🩵"]` Check warning on line 917 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCLDRFile.java GitHub Actions / build `(TestCLDRFile.java:917) Warning: «Gesicht \| keine Ahnung \| Smiley \| traurig \| verwirrt \| verwundert \| weiß nicht» contains ß at //ldml/annotations/annotation[@cp="😕"]`
	}
	}
	}