diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml index d4a8db48c9a..0a597ae3883 100644 --- a/common/supplemental/likelySubtags.xml +++ b/common/supplemental/likelySubtags.xml @@ -16,122 +16,50 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -140,8 +68,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -160,42 +86,16 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -218,58 +118,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -290,100 +154,44 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -394,80 +202,36 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -476,8 +240,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -498,22 +260,10 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -552,100 +302,46 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -656,28 +352,16 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -686,40 +370,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - @@ -732,22 +398,10 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -762,20 +416,14 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - @@ -784,90 +432,34 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -878,16 +470,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -896,78 +484,42 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1006,8 +558,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -1018,8 +568,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -1028,64 +576,30 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1094,42 +608,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - @@ -1144,10 +638,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -1158,38 +648,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - @@ -1200,8 +674,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -1212,32 +684,18 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - @@ -1250,72 +708,30 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1324,32 +740,16 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - @@ -1358,48 +758,18 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1412,10 +782,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -1426,18 +792,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -1450,54 +804,26 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1510,34 +836,16 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - @@ -1582,74 +890,26 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1658,80 +918,36 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1746,24 +962,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -1776,64 +980,28 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1842,64 +1010,30 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1910,48 +1044,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1962,46 +1070,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - @@ -2020,8 +1104,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -2030,22 +1112,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - @@ -2054,22 +1126,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - @@ -2080,36 +1142,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - @@ -2134,8 +1182,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -2144,10 +1190,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -2160,8 +1202,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -2180,18 +1220,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - @@ -2226,96 +1260,46 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2338,28 +1322,16 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -2368,18 +1340,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - @@ -2390,28 +1356,8 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - @@ -2420,32 +1366,20 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - @@ -2456,16 +1390,8 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - @@ -2478,38 +1404,20 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - @@ -2522,44 +1430,22 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - @@ -2568,14 +1454,10 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -2604,26 +1486,8 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - @@ -2632,12 +1496,8 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -2648,8 +1508,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -2664,18 +1522,12 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - @@ -2684,68 +1536,26 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2762,74 +1572,26 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2838,12 +1600,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - @@ -2894,27 +1650,25 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - + + + + - - @@ -3128,66 +1882,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3304,10 +1998,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - - - @@ -3926,8 +2616,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - - @@ -10179,5 +8867,642 @@ not be patched by hand, as any changes made in that fashion may be lost. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt index 4f1b2e54dd1..eaa0691931d 100644 --- a/common/testData/localeIdentifiers/likelySubtags.txt +++ b/common/testData/localeIdentifiers/likelySubtags.txt @@ -435,6 +435,11 @@ fr-TN ; fr-Latn-TN ; fr-TN ; fr-VU ; fr-Latn-VU ; fr-VU ; fr-WF ; fr-Latn-WF ; fr-WF ; fr-YT ; fr-Latn-YT ; fr-YT ; +fy ; fy-Latn-NL ; fy ; +fy-AQ ; fy-Latn-AQ ; fy-AQ ; +fy-Egyp ; fy-Egyp-NL ; fy-Egyp ; +fy-Latn ; fy-Latn-NL ; fy ; +fy-NL ; fy-Latn-NL ; fy ; ga ; ga-Latn-IE ; ga ; ga-AQ ; ga-Latn-AQ ; ga-AQ ; ga-Egyp ; ga-Egyp-IE ; ga-Egyp ; @@ -500,6 +505,11 @@ id-AQ ; id-Latn-AQ ; id-AQ ; id-Egyp ; id-Egyp-ID ; id-Egyp ; id-ID ; id-Latn-ID ; id ; id-Latn ; id-Latn-ID ; id ; +ie ; ie-Latn-EE ; ie ; +ie-AQ ; ie-Latn-AQ ; ie-AQ ; +ie-EE ; ie-Latn-EE ; ie ; +ie-Egyp ; ie-Egyp-EE ; ie-Egyp ; +ie-Latn ; ie-Latn-EE ; ie ; ig ; ig-Latn-NG ; ig ; ig-AQ ; ig-Latn-AQ ; ig-AQ ; ig-Egyp ; ig-Egyp-NG ; ig-Egyp ; @@ -594,6 +604,21 @@ ky-AQ ; ky-Cyrl-AQ ; ky-AQ ; ky-Cyrl ; ky-Cyrl-KG ; ky ; ky-Egyp ; ky-Egyp-KG ; ky-Egyp ; ky-KG ; ky-Cyrl-KG ; ky ; +lb ; lb-Latn-LU ; lb ; +lb-AQ ; lb-Latn-AQ ; lb-AQ ; +lb-Egyp ; lb-Egyp-LU ; lb-Egyp ; +lb-LU ; lb-Latn-LU ; lb ; +lb-Latn ; lb-Latn-LU ; lb ; +lij ; lij-Latn-IT ; lij ; +lij-AQ ; lij-Latn-AQ ; lij-AQ ; +lij-Egyp ; lij-Egyp-IT ; lij-Egyp ; +lij-IT ; lij-Latn-IT ; lij ; +lij-Latn ; lij-Latn-IT ; lij ; +lmo ; lmo-Latn-IT ; lmo ; +lmo-AQ ; lmo-Latn-AQ ; lmo-AQ ; +lmo-Egyp ; lmo-Egyp-IT ; lmo-Egyp ; +lmo-IT ; lmo-Latn-IT ; lmo ; +lmo-Latn ; lmo-Latn-IT ; lmo ; lo ; lo-Laoo-LA ; lo ; lo-AQ ; lo-Laoo-AQ ; lo-AQ ; lo-Egyp ; lo-Egyp-LA ; lo-Egyp ; @@ -652,6 +677,11 @@ ms-ID ; ms-Latn-ID ; ms-ID ; ms-Latn ; ms-Latn-MY ; ms ; ms-MY ; ms-Latn-MY ; ms ; ms-SG ; ms-Latn-SG ; ms-SG ; +mt ; mt-Latn-MT ; mt ; +mt-AQ ; mt-Latn-AQ ; mt-AQ ; +mt-Egyp ; mt-Egyp-MT ; mt-Egyp ; +mt-Latn ; mt-Latn-MT ; mt ; +mt-MT ; mt-Latn-MT ; mt ; my ; my-Mymr-MM ; my ; my-AQ ; my-Mymr-AQ ; my-AQ ; my-Egyp ; my-Egyp-MM ; my-Egyp ; @@ -663,6 +693,12 @@ nb-Egyp ; nb-Egyp-NO ; nb-Egyp ; nb-Latn ; nb-Latn-NO ; nb ; nb-NO ; nb-Latn-NO ; nb ; nb-SJ ; nb-Latn-SJ ; nb-SJ ; +nds ; nds-Latn-DE ; nds ; +nds-AQ ; nds-Latn-AQ ; nds-AQ ; +nds-DE ; nds-Latn-DE ; nds ; +nds-Egyp ; nds-Egyp-DE ; nds-Egyp ; +nds-Latn ; nds-Latn-DE ; nds ; +nds-NL ; nds-Latn-NL ; nds-NL ; ne ; ne-Deva-NP ; ne ; ne-AQ ; ne-Deva-AQ ; ne-AQ ; ne-Deva ; ne-Deva-NP ; ne ; @@ -690,6 +726,17 @@ no-AQ ; no-Latn-AQ ; no-AQ ; no-Egyp ; no-Egyp-NO ; no-Egyp ; no-Latn ; no-Latn-NO ; no ; no-NO ; no-Latn-NO ; no ; +nqo ; nqo-Nkoo-GN ; nqo ; +nqo-AQ ; nqo-Nkoo-AQ ; nqo-AQ ; +nqo-Egyp ; nqo-Egyp-GN ; nqo-Egyp ; +nqo-GN ; nqo-Nkoo-GN ; nqo ; +nqo-Nkoo ; nqo-Nkoo-GN ; nqo ; +oc ; oc-Latn-FR ; oc ; +oc-AQ ; oc-Latn-AQ ; oc-AQ ; +oc-ES ; oc-Latn-ES ; oc-ES ; +oc-Egyp ; oc-Egyp-FR ; oc-Egyp ; +oc-FR ; oc-Latn-FR ; oc ; +oc-Latn ; oc-Latn-FR ; oc ; or ; or-Orya-IN ; or ; or-AQ ; or-Orya-AQ ; or-AQ ; or-Egyp ; or-Egyp-IN ; or-Egyp ; @@ -710,6 +757,11 @@ pl-AQ ; pl-Latn-AQ ; pl-AQ ; pl-Egyp ; pl-Egyp-PL ; pl-Egyp ; pl-Latn ; pl-Latn-PL ; pl ; pl-PL ; pl-Latn-PL ; pl ; +prg ; prg-Latn-PL ; prg ; +prg-AQ ; prg-Latn-AQ ; prg-AQ ; +prg-Egyp ; prg-Egyp-PL ; prg-Egyp ; +prg-Latn ; prg-Latn-PL ; prg ; +prg-PL ; prg-Latn-PL ; prg ; ps ; ps-Arab-AF ; ps ; ps-AF ; ps-Arab-AF ; ps ; ps-AQ ; ps-Arab-AQ ; ps-AQ ; @@ -774,6 +826,11 @@ sa-AQ ; sa-Deva-AQ ; sa-AQ ; sa-Deva ; sa-Deva-IN ; sa ; sa-Egyp ; sa-Egyp-IN ; sa-Egyp ; sa-IN ; sa-Deva-IN ; sa ; +sah ; sah-Cyrl-RU ; sah ; +sah-AQ ; sah-Cyrl-AQ ; sah-AQ ; +sah-Cyrl ; sah-Cyrl-RU ; sah ; +sah-Egyp ; sah-Egyp-RU ; sah-Egyp ; +sah-RU ; sah-Cyrl-RU ; sah ; sat ; sat-Olck-IN ; sat ; sat-AQ ; sat-Olck-AQ ; sat-AQ ; sat-Egyp ; sat-Egyp-IN ; sat-Egyp ; @@ -850,6 +907,17 @@ sw-KE ; sw-Latn-KE ; sw-KE ; sw-Latn ; sw-Latn-TZ ; sw ; sw-TZ ; sw-Latn-TZ ; sw ; sw-UG ; sw-Latn-UG ; sw-UG ; +syr ; syr-Syrc-IQ ; syr ; +syr-AQ ; syr-Syrc-AQ ; syr-AQ ; +syr-Egyp ; syr-Egyp-IQ ; syr-Egyp ; +syr-IQ ; syr-Syrc-IQ ; syr ; +syr-SY ; syr-Syrc-SY ; syr-SY ; +syr-Syrc ; syr-Syrc-IQ ; syr ; +szl ; szl-Latn-PL ; szl ; +szl-AQ ; szl-Latn-AQ ; szl-AQ ; +szl-Egyp ; szl-Egyp-PL ; szl-Egyp ; +szl-Latn ; szl-Latn-PL ; szl ; +szl-PL ; szl-Latn-PL ; szl ; ta ; ta-Taml-IN ; ta ; ta-AQ ; ta-Taml-AQ ; ta-AQ ; ta-Egyp ; ta-Egyp-IN ; ta-Egyp ; @@ -900,6 +968,11 @@ tt-AQ ; tt-Cyrl-AQ ; tt-AQ ; tt-Cyrl ; tt-Cyrl-RU ; tt ; tt-Egyp ; tt-Egyp-RU ; tt-Egyp ; tt-RU ; tt-Cyrl-RU ; tt ; +ug ; ug-Arab-CN ; ug ; +ug-AQ ; ug-Arab-AQ ; ug-AQ ; +ug-Arab ; ug-Arab-CN ; ug ; +ug-CN ; ug-Arab-CN ; ug ; +ug-Egyp ; ug-Egyp-CN ; ug-Egyp ; uk ; uk-Cyrl-UA ; uk ; uk-AQ ; uk-Cyrl-AQ ; uk-AQ ; uk-Cyrl ; uk-Cyrl-UA ; uk ; @@ -945,6 +1018,7 @@ und-Arab-AE ; ar-Arab-AE ; ar-AE ; und-Arab-AF ; fa-Arab-AF ; fa-AF ; und-Arab-AQ ; ar-Arab-AQ ; ar-AQ ; und-Arab-BH ; ar-Arab-BH ; ar-BH ; +und-Arab-CN ; ug-Arab-CN ; ug ; und-Arab-DJ ; ar-Arab-DJ ; ar-DJ ; und-Arab-DZ ; ar-Arab-DZ ; ar-DZ ; und-Arab-EG ; ar-Arab-EG ; ar ; @@ -1222,6 +1296,7 @@ und-Latn-CI ; fr-Latn-CI ; fr-CI ; und-Latn-CK ; en-Latn-CK ; en-CK ; und-Latn-CL ; es-Latn-CL ; es-CL ; und-Latn-CM ; fr-Latn-CM ; fr-CM ; +und-Latn-CN ; za-Latn-CN ; za ; und-Latn-CO ; es-Latn-CO ; es-CO ; und-Latn-CR ; es-Latn-CR ; es-CR ; und-Latn-CU ; es-Latn-CU ; es-CU ; @@ -1434,6 +1509,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 ; 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 ; @@ -1485,6 +1563,10 @@ und-SZ ; en-Latn-SZ ; en-SZ ; und-Sinh ; si-Sinh-LK ; si ; und-Sinh-AQ ; si-Sinh-AQ ; si-AQ ; und-Sinh-LK ; si-Sinh-LK ; si ; +und-Syrc ; syr-Syrc-IQ ; syr ; +und-Syrc-AQ ; syr-Syrc-AQ ; syr-AQ ; +und-Syrc-IQ ; syr-Syrc-IQ ; syr ; +und-Syrc-SY ; syr-Syrc-SY ; syr-SY ; und-TC ; en-Latn-TC ; en-TC ; und-TD ; fr-Latn-TD ; fr-TD ; und-TG ; fr-Latn-TG ; fr-TG ; @@ -1555,6 +1637,11 @@ vi-AQ ; vi-Latn-AQ ; vi-AQ ; vi-Egyp ; vi-Egyp-VN ; vi-Egyp ; vi-Latn ; vi-Latn-VN ; vi ; vi-VN ; vi-Latn-VN ; vi ; +vmw ; vmw-Latn-MZ ; vmw ; +vmw-AQ ; vmw-Latn-AQ ; vmw-AQ ; +vmw-Egyp ; vmw-Egyp-MZ ; vmw-Egyp ; +vmw-Latn ; vmw-Latn-MZ ; vmw ; +vmw-MZ ; vmw-Latn-MZ ; vmw ; wo ; wo-Latn-SN ; wo ; wo-AQ ; wo-Latn-AQ ; wo-AQ ; wo-Egyp ; wo-Egyp-SN ; wo-Egyp ; @@ -1590,6 +1677,11 @@ yue-Egyp ; yue-Egyp-HK ; yue-Egyp ; yue-HK ; yue-Hant-HK ; yue ; yue-Hans ; yue-Hans-CN ; yue-Hans ; yue-CN yue-Hant ; yue-Hant-HK ; yue ; +za ; za-Latn-CN ; za ; +za-AQ ; za-Latn-AQ ; za-AQ ; +za-CN ; za-Latn-CN ; za ; +za-Egyp ; za-Egyp-CN ; za-Egyp ; +za-Latn ; za-Latn-CN ; za ; zh ; zh-Hans-CN ; zh ; zh-AQ ; zh-Hans-AQ ; zh-AQ ; zh-CN ; zh-Hans-CN ; zh ; diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateMaximalLocales.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateMaximalLocales.java index c017612e46a..b74ed4bc018 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateMaximalLocales.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateMaximalLocales.java @@ -37,13 +37,32 @@ import org.unicode.cldr.draft.FileUtilities; import org.unicode.cldr.draft.ScriptMetadata; import org.unicode.cldr.draft.ScriptMetadata.Info; -import org.unicode.cldr.util.*; +import org.unicode.cldr.util.Builder; +import org.unicode.cldr.util.CLDRConfig; +import org.unicode.cldr.util.CLDRFile; +import org.unicode.cldr.util.CLDRLocale; +import org.unicode.cldr.util.CLDRPaths; +import org.unicode.cldr.util.CldrUtility; +import org.unicode.cldr.util.Containment; +import org.unicode.cldr.util.Counter; +import org.unicode.cldr.util.Factory; +import org.unicode.cldr.util.Iso3166Data; +import org.unicode.cldr.util.Iso639Data; import org.unicode.cldr.util.Iso639Data.Scope; +import org.unicode.cldr.util.LanguageTagParser; +import org.unicode.cldr.util.LocaleIDParser; +import org.unicode.cldr.util.LocaleNames; +import org.unicode.cldr.util.Organization; +import org.unicode.cldr.util.PatternCache; +import org.unicode.cldr.util.SimpleFactory; +import org.unicode.cldr.util.StandardCodes; import org.unicode.cldr.util.StandardCodes.LstrType; +import org.unicode.cldr.util.SupplementalDataInfo; import org.unicode.cldr.util.SupplementalDataInfo.BasicLanguageData; import org.unicode.cldr.util.SupplementalDataInfo.BasicLanguageData.Type; import org.unicode.cldr.util.SupplementalDataInfo.OfficialStatus; import org.unicode.cldr.util.SupplementalDataInfo.PopulationData; +import org.unicode.cldr.util.Validity; import org.unicode.cldr.util.Validity.Status; /** @@ -371,6 +390,9 @@ enum OutputStyle { private static int errorCount; public static void main(String[] args) throws IOException { + if (true) { + throw new IllegalArgumentException("Don't run this tool until it is fixed"); + } printDefaultLanguagesAndScripts(); 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 index 4823e247fd8..e75ec1a31ee 100644 --- 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 @@ -394,7 +394,10 @@ public void TestMissingInfoForRegion() { } } - static final Set KNOWN_SCRIPTS_WITHOUT_LIKELY_SUBTAGS = ImmutableSet.of("Hatr", "Cpmn"); + // typically historical script that don't need to be in likely subtags + + static final Set KNOWN_SCRIPTS_WITHOUT_LIKELY_SUBTAGS = + ImmutableSet.of("Hatr", "Cpmn", "Ougr"); public void TestMissingInfoForScript() { VersionInfo icuUnicodeVersion = UCharacter.getUnicodeVersion(); @@ -712,7 +715,9 @@ public void testUndAllScriptsAndRegions() { Set possibleFixes = new TreeSet<>(); for (String region : regions) { final String undRegion = "und_" + region; - if (!assertTrue("contains und_" + region, likely.containsKey(undRegion))) { + if (region.equals("150") && likely.containsKey("und")) { + // skip + } else if (!assertTrue("contains und_" + region, likely.containsKey(undRegion))) { Set languages = SUPPLEMENTAL_DATA_INFO.getLanguagesForTerritoryWithPopulationData(region); double biggest = -1;