CLDR-17274 XCG translations (#3471)

* CLDR-17274 XCG translations CLDR-17274 Add XCG translations for root, en, es, fr, nl See #3471 * CLDR-17274 Update currency.xml CLDR-17274 Update bcp47 currency.xml for XCG * CLDR-17274 fix typo CLDR-17274 - Fix typo * CLDR-17274 Make other changes for new currency. Note that there was a code change because the code is not yet valid, and the tests were not set up for that. --------- Co-authored-by: macchiati <[email protected]>
unicode-org · Feb 1, 2024 · 1382b8f · 1382b8f
1 parent 8602ce0
commit 1382b8f
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 18 deletions.
diff --git a/common/bcp47/currency.xml b/common/bcp47/currency.xml
@@ -291,6 +291,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="xbc" description="European Unit of Account (XBC)" since="1.9"/>
             <type name="xbd" description="European Unit of Account (XBD)" since="1.9"/>
             <type name="xcd" description="East Caribbean Dollar"/>
+            <type name="xcg" description="Caribbean Guilder"/>
             <type name="xdr" description="Special Drawing Rights" since="1.9"/>
             <type name="xeu" description="European Currency Unit" since="1.9"/>
             <type name="xfo" description="French Gold Franc" since="1.9"/>

diff --git a/common/main/en.xml b/common/main/en.xml
@@ -6485,6 +6485,11 @@ annotations.
 				<displayName count="one">East Caribbean dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean guilder</displayName>
+				<displayName count="one">Caribbean guilder</displayName>
+				<displayName count="other">Caribbean guilders</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
 				<displayName count="one">special drawing rights</displayName>

diff --git a/common/main/es.xml b/common/main/es.xml
@@ -7493,6 +7493,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>XCD</symbol>
 				<symbol alt="narrow">↑↑↑</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florín caribeño</displayName>
+				<displayName count="one">florín caribeño</displayName>
+				<displayName count="other">florines caribeños</displayName>
+				<symbol>↑↑↑</symbol>
+				<symbol alt="narrow">↑↑↑</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>derechos especiales de giro</displayName>
 			</currency>

diff --git a/common/main/fr.xml b/common/main/fr.xml
@@ -9819,6 +9819,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>XCD</symbol>
 				<symbol alt="narrow">↑↑↑</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florin caribéen</displayName>
+				<displayName count="one">florin caribéen</displayName>
+				<displayName count="other">florins caribéens</displayName>
+				<symbol>↑↑↑</symbol>
+				<symbol alt="narrow">↑↑↑</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>droit de tirage spécial</displayName>
 				<displayName count="one">droit de tirage spécial</displayName>

diff --git a/common/main/nl.xml b/common/main/nl.xml
@@ -15251,6 +15251,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>↑↑↑</symbol>
 				<symbol alt="narrow">↑↑↑</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribische gulden</displayName>
+				<displayName count="one">↑↑↑</displayName>
+				<displayName count="other">↑↑↑</displayName>
+				<symbol>↑↑↑</symbol>
+				<symbol alt="narrow">Cg</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
 				<displayName count="one">↑↑↑</displayName>

diff --git a/common/main/root.xml b/common/main/root.xml
@@ -4516,6 +4516,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>EC$</symbol>
 				<symbol alt="narrow">$</symbol>
 			</currency>
+			<currency type="XCG">
+				<symbol>Cg.</symbol>
+			</currency>
 			<currency type="XOF">
 				<symbol>F CFA</symbol>
 			</currency>

diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
@@ -363,7 +363,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="PTE" from="1911-05-22" to="1975-07-05"/>
         </region>
         <region iso3166="CW">
-            <currency iso4217="ANG" from="2010-10-10"/>
+            <currency iso4217="XCG" from="2024-03-31"/>
+            <currency iso4217="ANG" from="2010-10-10" to="2024-06-31"/>
         </region>
         <region iso3166="CX">
             <currency iso4217="AUD" from="1966-02-14"/>
@@ -995,7 +996,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="SVC" from="1919-11-11" to="2001-01-01"/>
         </region>
         <region iso3166="SX">
-            <currency iso4217="ANG" from="2010-10-10"/>
+            <currency iso4217="XCG" from="2024-03-31"/>
+            <currency iso4217="ANG" from="2010-10-10" to="2024-06-31"/>
         </region>
         <region iso3166="SY">
             <currency iso4217="SYP" from="1948-01-01"/>

diff --git a/common/validity/currency.xml b/common/validity/currency.xml
@@ -36,7 +36,7 @@
 			UAH UGX USD UYU UZS
 			VES VND VUV
 			WST
-			XAF XCD XOF XPF
+			XAF XCD XCG XOF XPF
 			YER
 			ZAR ZMW
 		</id>

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java
@@ -20,6 +20,7 @@
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -1484,4 +1485,15 @@ public boolean isLstregDeprecated(String type, String code) {
         Map<String, String> lStregData = getLStreg().get(type).get(code);
         return lStregData.get("Deprecated") != null;
     }
+
+    /** get prospective currencies. Only needed for a few tests */
+    public Set<String> getOncomingCurrencies() {
+        Set<String> result = new HashSet<>();
+        for (Entry<String, List<String>> entry : getCodeData(CodeType.currency).entrySet()) {
+            if (entry.getValue().get(3).equals("P")) {
+                result.add(entry.getKey());
+            }
+        }
+        return result;
+    }
 }
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/ISO4217.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/ISO4217.txt
@@ -6,6 +6,7 @@
 # = I for intermediate (introduced and obsoleted after ISO 4217:2001(E/F))
 # = O for obsolete in 2001 (Table A.3 of ISO 4217:2001(E/F))
 # = X for non-ISO in 2001 (Table A.3 of ISO 4217:2001(E/F), with *)
+# = P for codes that will be in current, customary use, but the 'from' date is in the future.
 currency	|	XAG	|	Silver	|	ZZ	|	(no country)	|	C
 currency	|	XAU	|	Gold	|	ZZ	|	(no country)	|	C
 currency	|	XBA	|	Bond Markets Units European Composite Unit (EURCO)	|	ZZ	|	(no country)	|	C
@@ -402,3 +403,5 @@ currency	|	STD	|	Dobra	|	ST	|	SÃO TOME AND PRINCIPE	|	O
 currency	|	VEF	|	Bolivar Fuerte	|	VE	|	VENEZUELA	|	O
 currency	|	UYW	|	Uruguayan Nominal Wage Index Unit	|	UY	|	URUGUAY	|	F
 currency    |   VED |   Bolívar Soberano    |  VE   |  VENEZUALA   | F
+currency    |   XCG |   Caribbean Guilder    |  CW   |   CURAÇAO  | P
+currency    |   XCG |   Caribbean Guilder    |  SX   |   SINT MAARTEN  | P
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/dl_iso_table_a1.xml b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/dl_iso_table_a1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ISO_4217 Pblshd="2023-01-01">
+<ISO_4217 Pblshd="2024-01-01">
 	<CcyTbl>
 		<CcyNtry>
 			<CtryNm>AFGHANISTAN</CtryNm>
@@ -434,8 +434,8 @@
 		</CcyNtry>
 		<CcyNtry>
 			<CtryNm>CURAÇAO</CtryNm>
-			<CcyNm>Netherlands Antillean Guilder</CcyNm>
-			<Ccy>ANG</Ccy>
+			<CcyNm>Caribbean Guilder</CcyNm>
+			<Ccy>XCG</Ccy>
 			<CcyNbr>532</CcyNbr>
 			<CcyMnrUnts>2</CcyMnrUnts>
 		</CcyNtry>
@@ -1486,13 +1486,6 @@
 			<CcyNbr>690</CcyNbr>
 			<CcyMnrUnts>2</CcyMnrUnts>
 		</CcyNtry>
-		<CcyNtry>
-			<CtryNm>SIERRA LEONE</CtryNm>
-			<CcyNm>Leone</CcyNm>
-			<Ccy>SLL</Ccy>
-			<CcyNbr>694</CcyNbr>
-			<CcyMnrUnts>2</CcyMnrUnts>
-		</CcyNtry>
 		<CcyNtry>
 			<CtryNm>SIERRA LEONE</CtryNm>
 			<CcyNm>Leone</CcyNm>
@@ -1509,8 +1502,8 @@
 		</CcyNtry>
 		<CcyNtry>
 			<CtryNm>SINT MAARTEN (DUTCH PART)</CtryNm>
-			<CcyNm>Netherlands Antillean Guilder</CcyNm>
-			<Ccy>ANG</Ccy>
+			<CcyNm>Caribbean Guilder</CcyNm>
+			<Ccy>XCG</Ccy>
 			<CcyNbr>532</CcyNbr>
 			<CcyMnrUnts>2</CcyMnrUnts>
 		</CcyNtry>

diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/dl_iso_table_a3.xml b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/dl_iso_table_a3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ISO_4217 Pblshd="2023-01-01">
+<ISO_4217 Pblshd="2024-01-01">
 	<HstrcCcyTbl>
 		<HstrcCcyNtry>
 			<CtryNm>AFGHANISTAN</CtryNm>
@@ -799,6 +799,13 @@
 			<CcyNbr>978</CcyNbr>
 			<WthdrwlDt>2006-10</WthdrwlDt>
 		</HstrcCcyNtry>
+		<HstrcCcyNtry>
+			<CtryNm>SIERRA LEONE</CtryNm>
+			<CcyNm>Leone</CcyNm>
+			<Ccy>SLL</Ccy>
+			<CcyNbr>694</CcyNbr>
+			<WthdrwlDt>2023-12</WthdrwlDt>
+		</HstrcCcyNtry>
 		<HstrcCcyNtry>
 			<CtryNm>SLOVAKIA</CtryNm>
 			<CcyNm>Slovak Koruna</CcyNm>

diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestSupplementalInfo.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestSupplementalInfo.java
@@ -51,15 +51,35 @@
 import org.unicode.cldr.tool.LikelySubtags;
 import org.unicode.cldr.tool.PluralMinimalPairs;
 import org.unicode.cldr.tool.PluralRulesFactory;
-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.CLDRFile.WinningChoice;
+import org.unicode.cldr.util.CLDRLocale;
+import org.unicode.cldr.util.CLDRURLS;
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.DateConstants;
+import org.unicode.cldr.util.GrammarInfo;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalFeature;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalScope;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalTarget;
+import org.unicode.cldr.util.Iso3166Data;
+import org.unicode.cldr.util.Iso639Data;
 import org.unicode.cldr.util.Iso639Data.Scope;
+import org.unicode.cldr.util.IsoCurrencyParser;
+import org.unicode.cldr.util.LanguageTagCanonicalizer;
+import org.unicode.cldr.util.LanguageTagParser;
+import org.unicode.cldr.util.Level;
+import org.unicode.cldr.util.LocaleNames;
+import org.unicode.cldr.util.Organization;
+import org.unicode.cldr.util.Pair;
+import org.unicode.cldr.util.PluralRanges;
+import org.unicode.cldr.util.PreferredAndAllowedHour;
 import org.unicode.cldr.util.PreferredAndAllowedHour.HourStyle;
+import org.unicode.cldr.util.StandardCodes;
 import org.unicode.cldr.util.StandardCodes.CodeType;
 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.ContainmentStyle;
@@ -73,6 +93,7 @@
 import org.unicode.cldr.util.SupplementalDataInfo.PluralType;
 import org.unicode.cldr.util.SupplementalDataInfo.PopulationData;
 import org.unicode.cldr.util.SupplementalDataInfo.SampleList;
+import org.unicode.cldr.util.Validity;
 import org.unicode.cldr.util.Validity.Status;
 
 public class TestSupplementalInfo extends TestFmwkPlus {
@@ -1453,6 +1474,7 @@ public void TestCompleteness() {
     public void TestSupplementalCurrency() {
         IsoCurrencyParser isoCodes = IsoCurrencyParser.getInstance();
         Set<String> currencyCodes = STANDARD_CODES.getGoodAvailableCodes("currency");
+        Set<String> oncomingCurrencyCodes = STANDARD_CODES.getOncomingCurrencies();
         Relation<String, Pair<String, CurrencyDateInfo>> nonModernCurrencyCodes =
                 Relation.of(
                         new TreeMap<String, Set<Pair<String, CurrencyDateInfo>>>(), TreeSet.class);
@@ -1529,6 +1551,7 @@ public void TestSupplementalCurrency() {
         logln("Modern Codes: " + modernCurrencyCodes.size() + "\t" + modernCurrencyCodes);
         Set<String> missing = new TreeSet<>(isoCurrenciesToCountries.keySet());
         missing.removeAll(modernCurrencyCodes.keySet());
+        missing.removeAll(oncomingCurrencyCodes);
         Set<String> recentMissing = new TreeSet<>(missing);
         recentMissing.retainAll(recentModernCurrencyCodes.keySet());
         if (recentMissing.size() != 0) {
@@ -1544,7 +1567,7 @@ public void TestSupplementalCurrency() {
         if (missing.size() != 0) {
             errln(
                     "Codes in ISO 4217 but not current tender in CLDR "
-                            + "(may need to update "
+                            + "(may need to update as per"
                             + CLDRURLS.UPDATING_CURRENCY_CODES
                             + " ): "
                             + currencyDateRelationToString(nonModernCurrencyCodes, missing));