From f1f44a4c78221945619c50055a67b36df9960f4d Mon Sep 17 00:00:00 2001 From: btangmu Date: Fri, 7 Feb 2025 15:12:57 -0500 Subject: [PATCH 1/5] CLDR-17014 Handle CURRENCY/CURRENCY_SYMBOL paths like LANGUAGE/SCRIPT/... -Use ExtraPaths instead of XMLSource.ResolvingSource.constructedItems -Paths constructed in this way no longer have fallback values -In ICUServiceBuilder, if currency value not found in CLDRFile, use code fallback -In TestExampleGenerator Test4528, if currency value not found in CLDRFile, use code fallback -In GenerateLocaleIDTestData, add comment to generated file indicating it was generated --- .../localeIdentifiers/localeDisplayName.txt | 1 + .../cldr/tool/GenerateLocaleIDTestData.java | 8 +++- .../org/unicode/cldr/util/ExtraPaths.java | 2 + .../unicode/cldr/util/ICUServiceBuilder.java | 9 +--- .../java/org/unicode/cldr/util/XMLSource.java | 47 ++++--------------- .../cldr/unittest/TestExampleGenerator.java | 4 ++ 6 files changed, 23 insertions(+), 48 deletions(-) diff --git a/common/testData/localeIdentifiers/localeDisplayName.txt b/common/testData/localeIdentifiers/localeDisplayName.txt index 079646171c5..54563a0f266 100644 --- a/common/testData/localeIdentifiers/localeDisplayName.txt +++ b/common/testData/localeIdentifiers/localeDisplayName.txt @@ -1,3 +1,4 @@ +# DO NOT EDIT THIS FILE, instead regenerate it using GenerateLocaleIDTestData.java # Test data for locale display name generation # Copyright © 1991-2025 Unicode, Inc. # For terms of use, see http://www.unicode.org/copyright.html diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLocaleIDTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLocaleIDTestData.java index 8ef8e6609fe..ecfdb4095ce 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLocaleIDTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLocaleIDTestData.java @@ -36,12 +36,18 @@ public class GenerateLocaleIDTestData { private static final CLDRConfig CLDR_CONFIG = CLDRConfig.getInstance(); private static final CLDRFile ENGLISH = CLDR_CONFIG.getEnglish(); + private static final String DO_NOT_EDIT = + "# DO NOT EDIT THIS FILE, instead regenerate it using " + + GenerateLocaleIDTestData.class.getSimpleName() + + ".java"; + public static void main(String[] args) throws IOException { // localeCanonicalization.txt try (TempPrintWriter pw = TempPrintWriter.openUTF8Writer( CLDRPaths.TEST_DATA + "localeIdentifiers", "localeCanonicalization.txt")) { + pw.println(DO_NOT_EDIT); pw.println("# Test data for locale identifier canonicalization"); pw.println(CldrUtility.getCopyrightString("# ")); pw.println( @@ -100,10 +106,10 @@ public static void main(String[] args) throws IOException { "en-MM", "zh-Hans-fonipa" }; - try (TempPrintWriter pw = TempPrintWriter.openUTF8Writer( CLDRPaths.TEST_DATA + "localeIdentifiers", "localeDisplayName.txt")) { + pw.println(DO_NOT_EDIT); pw.println( "# Test data for locale display name generation\n" + CldrUtility.getCopyrightString("# ") diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java index 44c680a993d..5763d7a8926 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java @@ -84,6 +84,8 @@ private static class Singleton { addPaths(NameType.SCRIPT); addPaths(NameType.TERRITORY); addPaths(NameType.VARIANT); + addPaths(NameType.CURRENCY); + addPaths(NameType.CURRENCY_SYMBOL); addMetazones(); pathsTemp.addAll(CONST_EXTRA_PATHS); paths = ImmutableSet.copyOf(pathsTemp); // preserves order (Sets.copyOf doesn't) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ICUServiceBuilder.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ICUServiceBuilder.java index 212651b1159..4f614fb3d01 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ICUServiceBuilder.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ICUServiceBuilder.java @@ -729,14 +729,7 @@ private DecimalFormat _getNumberFormat( currencySymbol = cldrFile.getWinningValueWithBailey(prefix + "symbol"); } if (currencySymbol == null) { - throw new NullPointerException( - cldrFile.getSourceLocation(prefix + "symbol") - + ": " - + cldrFile.getLocaleID() - + ": " - + ": null currencySymbol for " - + prefix - + "symbol"); + currencySymbol = key1; // code fallback } String currencyDecimal = cldrFile.getWinningValueWithBailey(prefix + "decimal"); if (currencyDecimal != null) { diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java index b79bb1391a4..5d6f20612d0 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java @@ -7,6 +7,8 @@ package org.unicode.cldr.util; +import static org.unicode.cldr.util.StandardCodes.CodeType.tzid; + import com.google.common.collect.Iterators; import com.ibm.icu.impl.Utility; import com.ibm.icu.util.Freezable; @@ -1590,31 +1592,13 @@ public String getLocaleID() { {"zhuyin", "collation"} }; - private static final boolean SKIP_SINGLEZONES = false; - private static XMLSource constructedItems = new SimpleXMLSource(CODE_FALLBACK_ID); + private static final XMLSource constructedItems = new SimpleXMLSource(CODE_FALLBACK_ID); static { - StandardCodes sc = StandardCodes.make(); - Map> countries_zoneSet = sc.getCountryToZoneSet(); - Map zone_countries = sc.getZoneToCountry(); - List nameTypeList = - List.of(NameType.CURRENCY, NameType.CURRENCY_SYMBOL, NameType.TZ_EXEMPLAR); - for (NameType nameType : nameTypeList) { - StandardCodes.CodeType codeType = nameType.toCodeType(); - Set codes = sc.getGoodAvailableCodes(codeType); - for (Iterator codeIt = codes.iterator(); codeIt.hasNext(); ) { - String code = codeIt.next(); - String value = code; - if (nameType == NameType.TZ_EXEMPLAR) { // skip single-zone countries - if (SKIP_SINGLEZONES) { - String country = zone_countries.get(code); - Set s = countries_zoneSet.get(country); - if (s != null && s.size() == 1) continue; - } - value = TimezoneFormatter.getFallbackName(value); - } - addFallbackCode(nameType, code, value); - } + for (String code : StandardCodes.make().getGoodAvailableCodes(tzid)) { + String value = TimezoneFormatter.getFallbackName(code); + String fullpath = NameType.TZ_EXEMPLAR.getKeyPath(code); + addFallbackCode(fullpath, value, null /* alt */); } addFallbackCode( @@ -1664,22 +1648,7 @@ public String getLocaleID() { constructedItems.freeze(); } - private static void addFallbackCode(NameType nameType, String code, String value) { - addFallbackCode(nameType, code, value, null); - } - - private static void addFallbackCode( - NameType nameType, String code, String value, String alt) { - String fullpath = nameType.getKeyPath(code); - String distinguishingPath = addFallbackCodeToConstructedItems(fullpath, value, alt); - } - private static void addFallbackCode(String fullpath, String value, String alt) { - addFallbackCodeToConstructedItems(fullpath, value, alt); // ignore unneeded return value - } - - private static String addFallbackCodeToConstructedItems( - String fullpath, String value, String alt) { if (alt != null) { // Insert the @alt= string after the last occurrence of "]" StringBuffer fullpathBuf = new StringBuffer(fullpath); @@ -1688,7 +1657,7 @@ private static String addFallbackCodeToConstructedItems( .insert(fullpathBuf.lastIndexOf("]") + 1, "[@alt=\"" + alt + "\"]") .toString(); } - return constructedItems.putValueAtPath(fullpath, value); + constructedItems.putValueAtPath(fullpath, value); } @Override diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java index 0b2adb78db5..89360eee376 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java @@ -46,6 +46,7 @@ import org.unicode.cldr.util.GrammarInfo.GrammaticalScope; import org.unicode.cldr.util.GrammarInfo.GrammaticalTarget; import org.unicode.cldr.util.Level; +import org.unicode.cldr.util.NameType; import org.unicode.cldr.util.Organization; import org.unicode.cldr.util.Pair; import org.unicode.cldr.util.PathHeader; @@ -959,6 +960,9 @@ public void Test4528() { String xpath = testPair[0]; String expected = testPair[1]; String value = exampleGenerator.getCldrFile().getStringValue(xpath); + if (value == null) { + value = NameType.getCode(xpath); + } String actual = simplify(exampleGenerator.getExampleHtml(xpath, value)); assertEquals("specifics", expected, actual); } From 83fd59bfd2dd9a538aefcb4e227ccbf988ee3808 Mon Sep 17 00:00:00 2001 From: btangmu Date: Sat, 8 Feb 2025 12:00:22 -0500 Subject: [PATCH 2/5] CLDR-17014 debugging --- common/main/hi.xml | 5 ---- common/main/no.xml | 28 ------------------- .../java/org/unicode/cldr/util/CLDRFile.java | 27 ++++++++++++++++++ .../org/unicode/cldr/unittest/TestPaths.java | 2 ++ 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/common/main/hi.xml b/common/main/hi.xml index 41a2e35f9e0..587b6282bf1 100644 --- a/common/main/hi.xml +++ b/common/main/hi.xml @@ -6712,7 +6712,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ बेलारूसी रूबल (2000–2016) ↑↑↑ ↑↑↑ - ↑↑↑ बेलीज़ डॉलर @@ -7203,7 +7202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ मॉरीटेनियन ओगुइया (1973–2017) ↑↑↑ ↑↑↑ - ↑↑↑ मॉरीटेनियन ओगुइया @@ -7477,7 +7475,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ साओ तोम और प्रिंसिपे डोबरा (1977–2017) ↑↑↑ ↑↑↑ - ↑↑↑ साओ टोम और प्रिंसिपे डोबरा @@ -7617,8 +7614,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ वेनेज़ुएला बोलिवर (2008–2018) ↑↑↑ ↑↑↑ - ↑↑↑ - ↑↑↑ वेनेज़ुएला बोलिवर diff --git a/common/main/no.xml b/common/main/no.xml index 4eaae0adbe5..4b9bb394d83 100644 --- a/common/main/no.xml +++ b/common/main/no.xml @@ -12019,19 +12019,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ angolanske nye kwanza (1990–2000) angolansk ny kwanza ↑↑↑ - ↑↑↑ angolanske omjusterte kwanza (1995–1999) angolansk kwanza reajustado (1995–1999) ↑↑↑ - ↑↑↑ argentinske australer argentinsk austral ↑↑↑ - ↑↑↑ argentinske peso ley @@ -12043,7 +12040,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ argentinsk pesos (1881–1970) argentinsk pesos (1881–1970) argentinske pesos (1881–1970) - ↑↑↑ argentinske pesos (1983–1985) @@ -12127,7 +12123,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ belgiske franc (konvertible) belgisk franc (konvertibel) ↑↑↑ - ↑↑↑ belgiske franc @@ -12145,7 +12140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bulgarske lev (hard) bulgarsk lev (hard) ↑↑↑ - ↑↑↑ bulgarske lev (sosialist) @@ -12208,7 +12202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bolivianske pesos boliviansk pesos ↑↑↑ - ↑↑↑ bolivianske mvdol @@ -12245,13 +12238,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ brasilianske cruzado novo (1989–1990) brasiliansk cruzado novo (1989–1990) ↑↑↑ - ↑↑↑ brasilianske cruzeiro (1993–1994) brasiliansk cruzeiro (1993–1994) ↑↑↑ - ↑↑↑ brasilianske cruzeiro (1942–1967) @@ -12328,7 +12319,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ WIR euro ↑↑↑ WIR-euro - ↑↑↑ sveitsiske franc @@ -12352,7 +12342,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chilenske unidades de fomento chilensk unidades de fomento ↑↑↑ - ↑↑↑ chilenske pesos @@ -12371,7 +12360,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kinas folkebank dollar ↑↑↑ ↑↑↑ - ↑↑↑ kinesiske yuan @@ -12404,7 +12392,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ serbiske dinarer (2002–2006) serbisk dinar (2002–2006) ↑↑↑ - ↑↑↑ tsjekkoslovakiske koruna (hard) @@ -12449,7 +12436,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ østtyske mark østtysk mark ↑↑↑ - ↑↑↑ tyske mark @@ -12493,7 +12479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ecuadorianske unidad de valor constante (UVC) ecuadoriansk unidad de valor constante (UVC) ↑↑↑ - ↑↑↑ estiske kroon @@ -12841,7 +12826,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sørkoreanske won (1945–1953) sørkoreansk won (1945–1953) ↑↑↑ - ↑↑↑ sørkoreanske won @@ -12970,7 +12954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ monegaskiske franc monegaskisk franc ↑↑↑ - ↑↑↑ moldovske cupon @@ -13050,7 +13033,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ maltesiske lira maltesisk lira ↑↑↑ - ↑↑↑ maltesiske pund @@ -13502,7 +13484,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ timoresiske escudo timoresisk escudo ↑↑↑ - ↑↑↑ tyrkiske lire (1922–2005) @@ -13574,7 +13555,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikanske dollar (neste dag) amerikansk dollar (neste dag) ↑↑↑ - ↑↑↑ amerikanske dollar (samme dag) @@ -13586,7 +13566,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguyanske pesos (indekserte enheter) ↑↑↑ ↑↑↑ - ↑↑↑ uruguayanske pesos (1975–1993) @@ -13667,7 +13646,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ gull unse gull unser gull - ↑↑↑ europeisk sammensatt enhet @@ -13710,13 +13688,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ europeisk valutaenhet europeisk valutaenhet europeiske valutaenheter - ↑↑↑ franske gullfranc fransk gullfranc ↑↑↑ - ↑↑↑ franske UIC-franc @@ -13756,7 +13732,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sucre ↑↑↑ ↑↑↑ - ↑↑↑ testvalutakode @@ -13798,7 +13773,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jugoslaviske noviy-dinarer jugoslavisk noviy-dinar ↑↑↑ - ↑↑↑ jugoslaviske konvertible dinarer @@ -13810,7 +13784,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jugoslaviske reformerte dinarer (1992–1993) jugoslavisk reformert dinar (1992–1993) ↑↑↑ - ↑↑↑ sørafrikanske rand (finansielle) @@ -13848,7 +13821,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zairiske zaire zairisk zaire ↑↑↑ - ↑↑↑ zimbabwiske dollar (1980–2008) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java index b0993b6e451..7f8ae9cfe72 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java @@ -713,10 +713,23 @@ public String transform(@SuppressWarnings("unused") String source) { * @return */ private String getFallbackPath(String xpath, boolean winning, boolean checkExtraPaths) { + if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { + System.out.println( + "CLDRFile.getFallbackPath called with VEF currency path; loc = " + + getLocaleID()); + } if (GrammaticalFeature.pathHasFeature(xpath) != null) { + if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { + System.out.println( + "CLDRFile.getFallbackPath VEF: GrammaticalFeature.pathHasFeature"); + } return getCountPathWithFallback(xpath, Count.other, winning); } if (checkExtraPaths && getRawExtraPaths().contains(xpath)) { + if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { + System.out.println( + "CLDRFile.getFallbackPath checkExtraPaths; raw contains VEF path"); + } return xpath; } return null; @@ -839,6 +852,13 @@ public boolean isHere(String path) { * @param value */ public CLDRFile add(String currentFullXPath, String value) { + if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(currentFullXPath)) { + System.out.println( + "Adding VEF currency path in CLDRFile.add; loc = " + + getLocaleID() + + "; value = " + + value); + } if (locked) throw new UnsupportedOperationException("Attempt to modify locked object"); // StringValue v = new StringValue(value, currentFullXPath); Log.logln( @@ -3068,6 +3088,13 @@ public String getWinningPath(String path) { public Collection getExtraPaths() { Set toAddTo = new HashSet<>(getRawExtraPaths()); for (String path : this) { + if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(path)) { + if (getStringValue(path) == null) { + System.out.println( + "Non-extra VEF path has null value in getExtraPaths! locale = " + + getLocaleID()); + } + } toAddTo.remove(path); } return toAddTo; diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestPaths.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestPaths.java index c0480703e93..b8e85fed11c 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestPaths.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestPaths.java @@ -201,6 +201,8 @@ private void checkFullpathValue( + locale + ",\t Value=null, \tPath: " + path + + ",\t Source: " + + source + ",\t IsExtraPath: " + isExtraPath); } From a8b19ce19a39e4e6aba26176b1752b0791110444 Mon Sep 17 00:00:00 2001 From: btangmu Date: Sat, 8 Feb 2025 22:00:27 -0500 Subject: [PATCH 3/5] CLDR-17014 Avoid adding constant currency paths twice; comments -Use getGoodAvailableCodes instead of getBcp47Keys().getAll(cu) for consistency and efficiency and to obviate toUpperCase --- .../org/unicode/cldr/util/ExtraPaths.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java index 5763d7a8926..1ee81e2042b 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ExtraPaths.java @@ -1,5 +1,7 @@ package org.unicode.cldr.util; +import static org.unicode.cldr.util.StandardCodes.CodeType.currency; + import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.Collections; @@ -84,6 +86,9 @@ private static class Singleton { addPaths(NameType.SCRIPT); addPaths(NameType.TERRITORY); addPaths(NameType.VARIANT); + // Note: CURRENCY and CURRENCY_SYMBOL both get the same set of codes. The difference is + // that CURRENCY paths end in "/displayName" while CURRENCY_SYMBOL paths end in + // "/symbol". Compare the method addCurrencies below, which is locale-dependent. addPaths(NameType.CURRENCY); addPaths(NameType.CURRENCY_SYMBOL); addMetazones(); @@ -278,19 +283,14 @@ private static void addDayPlurals(Set toAddTo, String localeID) { private static void addCurrencies( Set toAddTo, Set pluralCounts) { - for (String code : supplementalData.getBcp47Keys().getAll("cu")) { - String currencyCode = code.toUpperCase(); - toAddTo.add( - "//ldml/numbers/currencies/currency[@type=\"" + currencyCode + "\"]/symbol"); - toAddTo.add( - "//ldml/numbers/currencies/currency[@type=\"" - + currencyCode - + "\"]/displayName"); - if (!pluralCounts.isEmpty()) { + // This code is locale-dependent due to pluralCounts. Compare addPaths(NameType.CURRENCY) + // and addPaths(NameType.CURRENCY_SYMBOL) above, which are locale-independent. + if (!pluralCounts.isEmpty()) { + for (String code : StandardCodes.make().getGoodAvailableCodes(currency)) { for (SupplementalDataInfo.PluralInfo.Count count : pluralCounts) { toAddTo.add( "//ldml/numbers/currencies/currency[@type=\"" - + currencyCode + + code + "\"]/displayName[@count=\"" + count.toString() + "\"]"); From 670e802666b1edc0e49915e4c80e402868b18144 Mon Sep 17 00:00:00 2001 From: btangmu Date: Sat, 8 Feb 2025 23:30:48 -0500 Subject: [PATCH 4/5] CLDR-17014 Remove more problematic paths from xml -Remove some paths from xml with inheritance marker but nothing to inherit, failing TestPathHeadersAndValues -Remove debugging code added earlier in this PR --- common/main/en_IN.xml | 5 - common/main/no.xml | 255 ------------------ .../java/org/unicode/cldr/util/CLDRFile.java | 27 -- 3 files changed, 287 deletions(-) diff --git a/common/main/en_IN.xml b/common/main/en_IN.xml index 8bab0de2f37..a71213b5539 100644 --- a/common/main/en_IN.xml +++ b/common/main/en_IN.xml @@ -5734,7 +5734,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ ↑↑↑ ↑↑↑ - ↑↑↑ ↑↑↑ @@ -6188,7 +6187,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ ↑↑↑ ↑↑↑ - ↑↑↑ ↑↑↑ @@ -6444,7 +6442,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ↑↑↑ ↑↑↑ ↑↑↑ - ↑↑↑ ↑↑↑ @@ -6563,8 +6560,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Venezuelan Bolívar Venezuelan bolívar Venezuelan bolívars - ↑↑↑ - ↑↑↑ VEF diff --git a/common/main/no.xml b/common/main/no.xml index 4b9bb394d83..f129ad63873 100644 --- a/common/main/no.xml +++ b/common/main/no.xml @@ -11956,64 +11956,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ andorranske pesetas andorransk pesetas ↑↑↑ - ↑↑↑ emiratarabiske dirham emiratarabisk dirham ↑↑↑ - ↑↑↑ afgansk afghani (1927–2002) afghansk afghani (1927–2002) afghanske afghani (1927–2002) - ↑↑↑ afghanske afghani afghansk afghani ↑↑↑ - ↑↑↑ - ↑↑↑ albanske lek (1946–1965) albansk lek (1946–1965) ↑↑↑ - ↑↑↑ albanske lek albansk lek ↑↑↑ - ↑↑↑ armenske dram armensk dram ↑↑↑ - ↑↑↑ - ↑↑↑ nederlandske antillegylden nederlandsk antillegylden ↑↑↑ - ↑↑↑ angolanske kwanza angolansk kwanza ↑↑↑ - ↑↑↑ - ↑↑↑ angolanske kwanza (1977–1990) angolansk kwanza (1977–1990) ↑↑↑ - ↑↑↑ angolanske nye kwanza (1990–2000) @@ -12034,7 +12021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ argentinske peso ley argentinsk peso ley ↑↑↑ - ↑↑↑ argentinsk pesos (1881–1970) @@ -12045,20 +12031,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ argentinske pesos (1983–1985) argentinsk pesos (1983–1985) ↑↑↑ - ↑↑↑ argentinske pesos argentinsk peso ↑↑↑ - ↑↑↑ ↑↑↑ østerrikske shilling østerriksk schilling østerrikske schilling - ↑↑↑ australske dollar @@ -12071,52 +12054,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ arubiske floriner arubisk florin ↑↑↑ - ↑↑↑ aserbajdsjanske manat (1993–2006) aserbajdsjansk manat (1993–2006) ↑↑↑ - ↑↑↑ aserbajdsjanske manat aserbajdsjansk manat ↑↑↑ - ↑↑↑ ↑↑↑ bosnisk-hercegovinske dinarer (1992–1994) bosnisk-hercegovinsk dinar (1992–1994) ↑↑↑ - ↑↑↑ bosnisk-hercegovinske konvertible mark bosnisk-hercegovinsk konvertibel mark ↑↑↑ - ↑↑↑ ↑↑↑ nye bosnisk-hercegovinske dinarer (1994–1997) ny bosnisk-hercegovinsk dinar (1994–1997) ↑↑↑ - ↑↑↑ barbadiske dollar barbadisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ bangladeshiske taka bangladeshisk taka ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12128,13 +12103,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ belgiske franc belgisk franc ↑↑↑ - ↑↑↑ belgiske franc (finansielle) belgisk franc (finansiell) ↑↑↑ - ↑↑↑ bulgarske lev (hard) @@ -12145,58 +12118,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bulgarske lev (sosialist) bulgarsk lev (sosialist) ↑↑↑ - ↑↑↑ bulgarske lev bulgarsk lev ↑↑↑ - ↑↑↑ bulgarske lev (1879–1952) bulgarsk lev (1879–1952) ↑↑↑ - ↑↑↑ bahrainske dinarer bahrainsk dinar ↑↑↑ - ↑↑↑ burundiske franc burundisk franc ↑↑↑ - ↑↑↑ bermudiske dollar bermudisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ bruneiske dollar bruneisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ bolivianske boliviano boliviansk boliviano ↑↑↑ - ↑↑↑ ↑↑↑ bolivianske boliviano (1863–1963) boliviansk boliviano (1863–1963) ↑↑↑ - ↑↑↑ bolivianske pesos @@ -12207,25 +12171,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bolivianske mvdol ↑↑↑ ↑↑↑ - ↑↑↑ brasilianske cruzeiro novo (1967–1986) brasiliansk cruzeiro novo (1967–1986) ↑↑↑ - ↑↑↑ brasilianske cruzados (1986–1989) brasiliansk cruzado (1986–1989) brasilianske cruzado (1986–1989) - ↑↑↑ brasilianske cruzeiro (1990–1993) brasiliansk cruzeiro (1990–1993) ↑↑↑ - ↑↑↑ brasilianske real @@ -12248,58 +12208,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ brasilianske cruzeiro (1942–1967) brasiliansk cruzeiro (1942–1967) ↑↑↑ - ↑↑↑ bahamanske dollar bahamansk dollar ↑↑↑ - ↑↑↑ ↑↑↑ bhutanske ngultrum bhutansk ngultrum ↑↑↑ - ↑↑↑ burmesiske kyat burmesisk kyat ↑↑↑ - ↑↑↑ botswanske pula botswansk pula ↑↑↑ - ↑↑↑ ↑↑↑ hviterussiske nye rubler (1994–1999) hviterussisk ny rubel (1994–1999) ↑↑↑ - ↑↑↑ nye belarusiske rubler ny belarusisk rubel ↑↑↑ - ↑↑↑ р. hviterussiske rubler (2000–2016) hviterussisk rubel (2000–2016) ↑↑↑ - ↑↑↑ beliziske dollar belizisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12313,7 +12264,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kongolesiske franc kongolesisk franc ↑↑↑ - ↑↑↑ WIR euro @@ -12324,19 +12274,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sveitsiske franc sveitsisk franc ↑↑↑ - ↑↑↑ WIR franc ↑↑↑ WIR-franc - ↑↑↑ chilenske escudo chilensk escudo ↑↑↑ - ↑↑↑ chilenske unidades de fomento @@ -12347,14 +12294,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chilenske pesos chilensk peso ↑↑↑ - ↑↑↑ ↑↑↑ kinesiske yuan (offshore) kinesisk yuan (offshore) ↑↑↑ - ↑↑↑ Kinas folkebank dollar @@ -12372,20 +12317,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ colombianske pesos colombiansk peso ↑↑↑ - ↑↑↑ ↑↑↑ colombianske unidad de valor real colombiansk unidad de valor real ↑↑↑ - ↑↑↑ costaricanske colón costaricansk colón ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12397,39 +12339,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tsjekkoslovakiske koruna (hard) tsjekkoslovakisk koruna (hard) ↑↑↑ - ↑↑↑ kubanske konvertible pesos kubansk konvertibel peso ↑↑↑ - ↑↑↑ ↑↑↑ kubanske pesos kubansk peso ↑↑↑ - ↑↑↑ ↑↑↑ kappverdiske escudos kappverdisk escudo ↑↑↑ - ↑↑↑ kypriotiske pund kypriotisk pund ↑↑↑ - ↑↑↑ tsjekkiske koruna tsjekkisk koruna ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12441,39 +12377,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tyske mark tysk mark ↑↑↑ - ↑↑↑ djiboutiske franc djiboutisk franc ↑↑↑ - ↑↑↑ danske kroner dansk krone ↑↑↑ - ↑↑↑ ↑↑↑ dominikanske pesos dominikansk peso ↑↑↑ - ↑↑↑ ↑↑↑ algeriske dinarer algerisk dinar ↑↑↑ - ↑↑↑ ecuadorianske sucre ecuadoriansk sucre ↑↑↑ - ↑↑↑ ecuadorianske unidad de valor constante (UVC) @@ -12484,173 +12414,146 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ estiske kroon estisk kroon estiske kroner - ↑↑↑ egyptiske pund egyptisk pund ↑↑↑ - ↑↑↑ ↑↑↑ eritreiske nakfa eritreisk nakfa ↑↑↑ - ↑↑↑ spanske peseta (A–konto) spansk peseta (A–konto) ↑↑↑ - ↑↑↑ spanske peseta (konvertibel konto) spansk peseta (konvertibel konto) ↑↑↑ - ↑↑↑ spanske peseta spansk peseta ↑↑↑ - ↑↑↑ etiopiske birr etiopisk birr ↑↑↑ - ↑↑↑ euro ↑↑↑ ↑↑↑ - ↑↑↑ ↑↑↑ finske mark finsk mark ↑↑↑ - ↑↑↑ fijianske dollar fijiansk dollar ↑↑↑ - ↑↑↑ ↑↑↑ falklandspund ↑↑↑ ↑↑↑ - ↑↑↑ ↑↑↑ franske franc fransk franc ↑↑↑ - ↑↑↑ britiske pund britisk pund ↑↑↑ - ↑↑↑ ↑↑↑ georgiske kupon larit georgisk kupon larit ↑↑↑ - ↑↑↑ georgiske lari georgisk lari ↑↑↑ - ↑↑↑ ↑↑↑ ghanesisk cedi (1979–2007) ghanesisk cedi (1979–2007) ghanesiske cedi (1979–2007) - ↑↑↑ ghanesiske cedi ghanesisk cedi ↑↑↑ - ↑↑↑ ↑↑↑ gibraltarske pund gibraltarsk pund ↑↑↑ - ↑↑↑ ↑↑↑ gambiske dalasi gambisk dalasi ↑↑↑ - ↑↑↑ guineanske franc guineansk franc ↑↑↑ - ↑↑↑ ↑↑↑ guineanske syli guineansk syli ↑↑↑ - ↑↑↑ ekvatorialguineanske ekwele guineana ekvatorialguineansk ekwele guineana ↑↑↑ - ↑↑↑ greske drakmer gresk drakme ↑↑↑ - ↑↑↑ guatemalanske quetzal guatemalansk quetzal ↑↑↑ - ↑↑↑ ↑↑↑ portugisiske guinea escudo portugisisk guinea escudo ↑↑↑ - ↑↑↑ Guinea-Bissau-pesos ↑↑↑ ↑↑↑ - ↑↑↑ guyanske dollar guyansk dollar ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12664,59 +12567,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ honduranske lempira honduransk lempira ↑↑↑ - ↑↑↑ ↑↑↑ kroatiske dinarer kroatisk dinar ↑↑↑ - ↑↑↑ kroatiske kuna kroatisk kuna ↑↑↑ - ↑↑↑ ↑↑↑ haitiske gourde haitisk gourde ↑↑↑ - ↑↑↑ ungarske forinter ungarsk forint ↑↑↑ - ↑↑↑ ↑↑↑ indonesiske rupier indonesisk rupi ↑↑↑ - ↑↑↑ ↑↑↑ irske pund irsk pund ↑↑↑ - ↑↑↑ israelske pund israelsk pund ↑↑↑ - ↑↑↑ israelske shekler (1980–1985) israelsk shekel (1980–1985) ↑↑↑ - ↑↑↑ nye israelske shekler @@ -12736,13 +12630,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ irakske dinarer iraksk dinar ↑↑↑ - ↑↑↑ iranske rialer iransk rial ↑↑↑ - ↑↑↑ islandske kroner (1918–1981) @@ -12753,27 +12645,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ islandske kroner islandsk krone ↑↑↑ - ↑↑↑ ↑↑↑ italienske lire italiensk lire ↑↑↑ - ↑↑↑ jamaikanske dollar jamaikansk dollar ↑↑↑ - ↑↑↑ ↑↑↑ jordanske dinarer jordansk dinar ↑↑↑ - ↑↑↑ japanske yen @@ -12786,41 +12674,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kenyanske shilling kenyansk shilling ↑↑↑ - ↑↑↑ kirgisiske som kirgisisk som ↑↑↑ - ↑↑↑ ↑↑↑ kambodsjanske riel kambodsjansk riel ↑↑↑ - ↑↑↑ ↑↑↑ komoriske franc komorisk franc ↑↑↑ - ↑↑↑ ↑↑↑ nordkoreanske won nordkoreansk won ↑↑↑ - ↑↑↑ ↑↑↑ sørkoreanske hwan (1953–1962) sørkoreansk hwan (1953–1962) ↑↑↑ - ↑↑↑ sørkoreanske won (1945–1953) @@ -12838,117 +12720,99 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kuwaitiske dinarer kuwaitisk dinar ↑↑↑ - ↑↑↑ caymanske dollar caymansk dollar ↑↑↑ - ↑↑↑ ↑↑↑ kasakhstanske tenge kasakhstansk tenge ↑↑↑ - ↑↑↑ ↑↑↑ laotiske kip laotisk kip ↑↑↑ - ↑↑↑ ↑↑↑ libanesiske pund libanesisk pund ↑↑↑ - ↑↑↑ ↑↑↑ srilankiske rupier srilankisk rupi ↑↑↑ - ↑↑↑ ↑↑↑ liberiske dollar liberisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ lesothiske loti lesothisk loti ↑↑↑ - ↑↑↑ litauiske litas litauisk lita litauiske lita - ↑↑↑ ↑↑↑ litauiske talonas litauisk talonas ↑↑↑ - ↑↑↑ luxemburgske konvertible franc luxemburgsk konvertibel franc ↑↑↑ - ↑↑↑ luxemburgske franc luxemburgsk franc ↑↑↑ - ↑↑↑ luxemburgske finansielle franc luxemburgsk finansiell franc ↑↑↑ - ↑↑↑ latviske lats latvisk lats ↑↑↑ - ↑↑↑ ↑↑↑ latviske rubler latvisk rubel ↑↑↑ - ↑↑↑ libyske dinarer libysk dinar ↑↑↑ - ↑↑↑ marokkanske dirham marokkansk dirham ↑↑↑ - ↑↑↑ marokkanske franc marokkansk franc ↑↑↑ - ↑↑↑ monegaskiske franc @@ -12959,19 +12823,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ moldovske cupon moldovsk cupon ↑↑↑ - ↑↑↑ moldovske leu moldovsk leu moldovske lei - ↑↑↑ madagassiske ariary madagassisk ariary ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12983,51 +12844,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ makedonske denarer makedonsk denar ↑↑↑ - ↑↑↑ makedonske denarer (1992–1993) makedonsk denar (1992–1993) ↑↑↑ - ↑↑↑ maliske franc malisk franc ↑↑↑ - ↑↑↑ myanmarske kyat myanmarsk kyat ↑↑↑ - ↑↑↑ ↑↑↑ mongolske tugrik mongolsk tugrik ↑↑↑ - ↑↑↑ ↑↑↑ makaoiske pataca makaoisk pataca ↑↑↑ - ↑↑↑ mauritanske ouguiya (1973–2017) mauritansk ouguiya (1973–2017) ↑↑↑ - ↑↑↑ mauritanske ouguiya mauritansk ouguiya ↑↑↑ - ↑↑↑ maltesiske lira @@ -13038,32 +12891,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ maltesiske pund maltesisk pund ↑↑↑ - ↑↑↑ mauritiske rupier mauritisk rupi ↑↑↑ - ↑↑↑ ↑↑↑ maldiviske rupier maldivisk rupi ↑↑↑ - ↑↑↑ maldiviske rufiyaa maldivisk rufiyaa ↑↑↑ - ↑↑↑ malawiske kwacha malawisk kwacha ↑↑↑ - ↑↑↑ meksikanske pesos @@ -13076,71 +12924,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ meksikanske sølvpesos (1861–1992) meksikansk sølvpesos (1860–1992) meksikanske sølvpesos (1860–1992) - ↑↑↑ meksikanske unidad de inversion (UDI) meksikansk unidad de inversion (UDI) ↑↑↑ - ↑↑↑ malaysiske ringgit malaysisk ringgit ↑↑↑ - ↑↑↑ ↑↑↑ mosambikiske escudo mosambikisk escudo ↑↑↑ - ↑↑↑ gamle mosambikiske metical gammel mosambikisk metical ↑↑↑ - ↑↑↑ mosambikiske metical mosambikisk metical ↑↑↑ - ↑↑↑ namibiske dollar namibisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ nigerianske naira nigeriansk naira ↑↑↑ - ↑↑↑ ↑↑↑ nicaraguanske cordoba (1988–1991) nicaraguansk cordoba (1988–1991) ↑↑↑ - ↑↑↑ nicaraguanske córdoba nicaraguansk córdoba ↑↑↑ - ↑↑↑ ↑↑↑ nederlandske gylden nederlandsk gylden ↑↑↑ - ↑↑↑ norske kroner @@ -13153,7 +12990,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nepalske rupier nepalsk rupi ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13167,37 +13003,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ omanske rialer omansk rial ↑↑↑ - ↑↑↑ panamanske balboa panamansk balboa ↑↑↑ - ↑↑↑ peruanske inti peruansk inti ↑↑↑ - ↑↑↑ peruanske sol peruansk sol ↑↑↑ - ↑↑↑ peruanske sol (1863–1965) peruansk sol (1863–1965) ↑↑↑ - ↑↑↑ papuanske kina papuansk kina ↑↑↑ - ↑↑↑ filippinske pesos @@ -13210,274 +13040,231 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pakistanske rupier pakistansk rupi ↑↑↑ - ↑↑↑ ↑↑↑ polske zloty polsk zloty ↑↑↑ - ↑↑↑ ↑↑↑ polske zloty (1950–1995) polsk zloty (1950–1995) ↑↑↑ - ↑↑↑ portugisiske escudo portugisisk escudo ↑↑↑ - ↑↑↑ paraguayanske guarani paraguayansk guarani ↑↑↑ - ↑↑↑ ↑↑↑ qatarske rialer qatarsk rial ↑↑↑ - ↑↑↑ rhodesiske dollar rhodesisk dollar ↑↑↑ - ↑↑↑ rumenske leu (1952–2006) rumensk leu (1952–2006) ↑↑↑ - ↑↑↑ rumenske leu rumensk leu rumenske lei - ↑↑↑ L serbiske dinarer serbisk dinar ↑↑↑ - ↑↑↑ russiske rubler russisk rubel ↑↑↑ - ↑↑↑ ↑↑↑ russiske rubler (1991–1998) russisk rubel (1991–1998) ↑↑↑ - ↑↑↑ rwandiske franc rwandisk franc ↑↑↑ - ↑↑↑ ↑↑↑ saudiarabiske riyaler saudiarabisk riyal ↑↑↑ - ↑↑↑ salomonske dollar salomonsk dollar ↑↑↑ - ↑↑↑ ↑↑↑ seychelliske rupier seychellisk rupi ↑↑↑ - ↑↑↑ sudanesiske dinarer (1992–2007) sudanesisk dinar (1992–2007) ↑↑↑ - ↑↑↑ sudanske pund sudansk pund ↑↑↑ - ↑↑↑ sudanesiske pund sudansk pund (1957–1998) sudanske pund (1957–1998) - ↑↑↑ svenske kroner svensk krone ↑↑↑ - ↑↑↑ ↑↑↑ singaporske dollar singaporsk dollar ↑↑↑ - ↑↑↑ ↑↑↑ sankthelenske pund sankthelensk pund ↑↑↑ - ↑↑↑ ↑↑↑ slovenske tolar slovensk tolar ↑↑↑ - ↑↑↑ slovakiske koruna slovakisk koruna ↑↑↑ - ↑↑↑ sierraleonsk leone sierraleonsk leone sierraleonske leoner - ↑↑↑ sierraleonsk leone (1964–2022) sierraleonsk leone (1964–2022) sierraleonske leoner (1964–2022) - ↑↑↑ somaliske shilling somalisk shilling ↑↑↑ - ↑↑↑ surinamske dollar surinamsk dollar ↑↑↑ - ↑↑↑ ↑↑↑ surinamske gylden surinamsk gylden ↑↑↑ - ↑↑↑ sørsudanske pund sørsudansk pund ↑↑↑ - ↑↑↑ ↑↑↑ saotomesiske dobra (1977–2017) saotomesisk dobra (1977–2017) ↑↑↑ - ↑↑↑ saotomesiske dobra saotomesisk dobra ↑↑↑ - ↑↑↑ ↑↑↑ sovjetiske rubler sovjetisk rubel ↑↑↑ - ↑↑↑ salvadoranske colon salvadoransk colon ↑↑↑ - ↑↑↑ syriske pund syrisk pund ↑↑↑ - ↑↑↑ ↑↑↑ swazilandske lilangeni swazilandsk lilangeni ↑↑↑ - ↑↑↑ thailandske baht thailandsk baht ↑↑↑ - ↑↑↑ ↑↑↑ tadsjikiske rubler tadsjikisk rubel ↑↑↑ - ↑↑↑ tadsjikiske somoni tadsjikisk somoni ↑↑↑ - ↑↑↑ turkmenske manat (1993–2009) turkmensk manat (1993–2009) ↑↑↑ - ↑↑↑ turkmenske manat turkmensk manat ↑↑↑ - ↑↑↑ tunisiske dinarer tunisisk dinar ↑↑↑ - ↑↑↑ tonganske paʻanga tongansk paʻanga ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13489,13 +13276,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tyrkiske lire (1922–2005) tyrkisk lire (1922–2005) ↑↑↑ - ↑↑↑ tyrkiske lire tyrkisk lire ↑↑↑ - ↑↑↑ ↑↑↑ ↑↑↑ @@ -13503,7 +13288,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ trinidadiske dollar trinidadisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13517,32 +13301,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tanzanianske shilling tanzaniansk shilling ↑↑↑ - ↑↑↑ ukrainske hryvnia ukrainsk hryvnia ↑↑↑ - ↑↑↑ ↑↑↑ ukrainske karbovanetz ukrainsk karbovanetz ↑↑↑ - ↑↑↑ ugandiske shilling (1966–1987) ugandisk shilling (1966–1987) ↑↑↑ - ↑↑↑ ugandiske shilling ugandisk shilling ↑↑↑ - ↑↑↑ amerikanske dollar @@ -13560,7 +13339,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikanske dollar (samme dag) amerikansk dollar (samme dag) ↑↑↑ - ↑↑↑ uruguyanske pesos (indekserte enheter) @@ -13571,39 +13349,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguayanske pesos (1975–1993) uruguayansk peso (1975–1993) ↑↑↑ - ↑↑↑ uruguayanske pesos uruguyansk peso ↑↑↑ - ↑↑↑ ↑↑↑ usbekiske som usbekisk som ↑↑↑ - ↑↑↑ venezuelanske bolivar (1871–2008) venezuelansk bolivar (1871–2008) ↑↑↑ - ↑↑↑ venezuelanske bolivar (2008–2018) venezuelansk bolivar (2008–2018) ↑↑↑ - ↑↑↑ ↑↑↑ venezuelanske bolivar venezuelansk bolivar ↑↑↑ - ↑↑↑ vietnamesiske dong @@ -13616,19 +13388,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ vietnamesiske dong (1978–1985) vietnamesisk dong (1978–1985) ↑↑↑ - ↑↑↑ vanuatiske vatu vanuatisk vatu ↑↑↑ - ↑↑↑ samoanske tala samoansk tala ↑↑↑ - ↑↑↑ sentralafrikanske CFA-franc @@ -13640,7 +13409,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sølv unse sølv unser sølv - ↑↑↑ gull @@ -13651,25 +13419,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ europeisk sammensatt enhet europeisk sammensatt enhet europeiske sammensatte enheter - ↑↑↑ europeisk monetær enhet europeisk monetær enhet europeiske monetære enheter - ↑↑↑ europeisk kontoenhet (XBC) europeisk kontoenhet (XBC) europeiske kontoenheter - ↑↑↑ europeisk kontoenhet (XBD) europeisk kontoenhet (XBD) europeiske kontoenheter (XBD) - ↑↑↑ østkaribiske dollar @@ -13682,7 +13446,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ spesielle trekkrettigheter spesiell trekkrettighet ↑↑↑ - ↑↑↑ europeisk valutaenhet @@ -13698,19 +13461,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ franske UIC-franc fransk UIC-franc ↑↑↑ - ↑↑↑ vestafrikanske CFA-franc vestafrikansk CFA-franc ↑↑↑ - ↑↑↑ palladium unse palladium unser palladium - ↑↑↑ CFP-franc @@ -13722,11 +13482,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ platina unse platina unser platina - ↑↑↑ RINET-fond - ↑↑↑ sucre @@ -13737,13 +13495,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ testvalutakode ↑↑↑ testvaluta - ↑↑↑ ADB-kontoenhet ADB-kontoenhet ADB-kontoenheter - ↑↑↑ ukjent valuta @@ -13755,19 +13511,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jemenittiske dinarer jemenittisk dinar ↑↑↑ - ↑↑↑ jemenittiske rialer jemenittisk rial ↑↑↑ - ↑↑↑ jugoslaviske dinarer (hard) jugoslavisk dinar (hard) ↑↑↑ - ↑↑↑ jugoslaviske noviy-dinarer @@ -13778,7 +13531,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jugoslaviske konvertible dinarer jugoslavisk konvertibel dinar ↑↑↑ - ↑↑↑ jugoslaviske reformerte dinarer (1992–1993) @@ -13789,33 +13541,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sørafrikanske rand (finansielle) sørafrikansk rand (finansiell) ↑↑↑ - ↑↑↑ sørafrikanske rand sørafrikansk rand ↑↑↑ - ↑↑↑ ↑↑↑ zambiske kwacha (1968–2012) zambisk kwacha (1968–2012) ↑↑↑ - ↑↑↑ zambiske kwacha zambisk kwacha ↑↑↑ - ↑↑↑ ↑↑↑ zairiske nye zaire zairisk ny zaire ↑↑↑ - ↑↑↑ zairiske zaire @@ -13826,13 +13573,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zimbabwiske dollar (1980–2008) zimbabwisk dollar (1980–2008) ↑↑↑ - ↑↑↑ zimbabwisk dollar (2009) zimbabwisk dollar (2009) zimbabwiske dollar (2009) - ↑↑↑ zimbabwisk dollar (2008) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java index 7f8ae9cfe72..b0993b6e451 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java @@ -713,23 +713,10 @@ public String transform(@SuppressWarnings("unused") String source) { * @return */ private String getFallbackPath(String xpath, boolean winning, boolean checkExtraPaths) { - if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { - System.out.println( - "CLDRFile.getFallbackPath called with VEF currency path; loc = " - + getLocaleID()); - } if (GrammaticalFeature.pathHasFeature(xpath) != null) { - if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { - System.out.println( - "CLDRFile.getFallbackPath VEF: GrammaticalFeature.pathHasFeature"); - } return getCountPathWithFallback(xpath, Count.other, winning); } if (checkExtraPaths && getRawExtraPaths().contains(xpath)) { - if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(xpath)) { - System.out.println( - "CLDRFile.getFallbackPath checkExtraPaths; raw contains VEF path"); - } return xpath; } return null; @@ -852,13 +839,6 @@ public boolean isHere(String path) { * @param value */ public CLDRFile add(String currentFullXPath, String value) { - if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(currentFullXPath)) { - System.out.println( - "Adding VEF currency path in CLDRFile.add; loc = " - + getLocaleID() - + "; value = " - + value); - } if (locked) throw new UnsupportedOperationException("Attempt to modify locked object"); // StringValue v = new StringValue(value, currentFullXPath); Log.logln( @@ -3088,13 +3068,6 @@ public String getWinningPath(String path) { public Collection getExtraPaths() { Set toAddTo = new HashSet<>(getRawExtraPaths()); for (String path : this) { - if ("//ldml/numbers/currencies/currency[@type=\"VEF\"]/symbol".equals(path)) { - if (getStringValue(path) == null) { - System.out.println( - "Non-extra VEF path has null value in getExtraPaths! locale = " - + getLocaleID()); - } - } toAddTo.remove(path); } return toAddTo; From b941eb4bd69465475b27ba9b994567d9b6967b8e Mon Sep 17 00:00:00 2001 From: btangmu Date: Sat, 8 Feb 2025 23:55:50 -0500 Subject: [PATCH 5/5] CLDR-17014 Hard-code BYN and RON as currency symbols in no.xml -Both paths have alt=narrow values -Console check fails if path with alt is present but the corresponding path without alt is missing --- common/main/no.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/main/no.xml b/common/main/no.xml index f129ad63873..1632caafb5c 100644 --- a/common/main/no.xml +++ b/common/main/no.xml @@ -12240,6 +12240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nye belarusiske rubler ny belarusisk rubel ↑↑↑ + BYN р. @@ -13083,6 +13084,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ rumenske leu rumensk leu rumenske lei + RON L