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/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..1632caafb5c 100644 --- a/common/main/no.xml +++ b/common/main/no.xml @@ -11956,113 +11956,92 @@ 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) angolansk ny kwanza ↑↑↑ - ↑↑↑ angolanske omjusterte kwanza (1995–1999) angolansk kwanza reajustado (1995–1999) ↑↑↑ - ↑↑↑ argentinske australer argentinsk austral ↑↑↑ - ↑↑↑ argentinske peso ley argentinsk peso ley ↑↑↑ - ↑↑↑ argentinsk pesos (1881–1970) argentinsk pesos (1881–1970) argentinske pesos (1881–1970) - ↑↑↑ argentinske pesos (1983–1985) argentinsk pesos (1983–1985) ↑↑↑ - ↑↑↑ argentinske pesos argentinsk peso ↑↑↑ - ↑↑↑ ↑↑↑ østerrikske shilling østerriksk schilling østerrikske schilling - ↑↑↑ australske dollar @@ -12075,164 +12054,138 @@ 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 ↑↑↑ - ↑↑↑ ↑↑↑ belgiske franc (konvertible) belgisk franc (konvertibel) ↑↑↑ - ↑↑↑ belgiske franc belgisk franc ↑↑↑ - ↑↑↑ belgiske franc (finansielle) belgisk franc (finansiell) ↑↑↑ - ↑↑↑ bulgarske lev (hard) bulgarsk lev (hard) ↑↑↑ - ↑↑↑ 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 boliviansk pesos ↑↑↑ - ↑↑↑ 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 @@ -12245,70 +12198,60 @@ 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) 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 ↑↑↑ - ↑↑↑ + BYN р. hviterussiske rubler (2000–2016) hviterussisk rubel (2000–2016) ↑↑↑ - ↑↑↑ beliziske dollar belizisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12322,56 +12265,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kongolesiske franc kongolesisk franc ↑↑↑ - ↑↑↑ WIR euro ↑↑↑ WIR-euro - ↑↑↑ sveitsiske franc sveitsisk franc ↑↑↑ - ↑↑↑ WIR franc ↑↑↑ WIR-franc - ↑↑↑ chilenske escudo chilensk escudo ↑↑↑ - ↑↑↑ chilenske unidades de fomento chilensk unidades de fomento ↑↑↑ - ↑↑↑ chilenske pesos chilensk peso ↑↑↑ - ↑↑↑ ↑↑↑ kinesiske yuan (offshore) kinesisk yuan (offshore) ↑↑↑ - ↑↑↑ Kinas folkebank dollar ↑↑↑ ↑↑↑ - ↑↑↑ kinesiske yuan @@ -12384,288 +12318,243 @@ 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 ↑↑↑ - ↑↑↑ ↑↑↑ serbiske dinarer (2002–2006) serbisk dinar (2002–2006) ↑↑↑ - ↑↑↑ 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 ↑↑↑ - ↑↑↑ ↑↑↑ østtyske mark østtysk mark ↑↑↑ - ↑↑↑ 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) ecuadoriansk unidad de valor constante (UVC) ↑↑↑ - ↑↑↑ 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 ↑↑↑ - ↑↑↑ ↑↑↑ @@ -12679,59 +12568,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 @@ -12751,13 +12631,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ irakske dinarer iraksk dinar ↑↑↑ - ↑↑↑ iranske rialer iransk rial ↑↑↑ - ↑↑↑ islandske kroner (1918–1981) @@ -12768,27 +12646,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 @@ -12801,47 +12675,40 @@ 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) sørkoreansk won (1945–1953) ↑↑↑ - ↑↑↑ sørkoreanske won @@ -12854,141 +12721,119 @@ 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 monegaskisk franc ↑↑↑ - ↑↑↑ moldovske cupon moldovsk cupon ↑↑↑ - ↑↑↑ moldovske leu moldovsk leu moldovske lei - ↑↑↑ madagassiske ariary madagassisk ariary ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13000,88 +12845,74 @@ 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 maltesisk lira ↑↑↑ - ↑↑↑ maltesiske pund maltesisk pund ↑↑↑ - ↑↑↑ mauritiske rupier mauritisk rupi ↑↑↑ - ↑↑↑ ↑↑↑ maldiviske rupier maldivisk rupi ↑↑↑ - ↑↑↑ maldiviske rufiyaa maldivisk rufiyaa ↑↑↑ - ↑↑↑ malawiske kwacha malawisk kwacha ↑↑↑ - ↑↑↑ meksikanske pesos @@ -13094,71 +12925,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 @@ -13171,7 +12991,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nepalske rupier nepalsk rupi ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13185,37 +13004,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 @@ -13228,293 +13041,248 @@ 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 - ↑↑↑ + RON 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 ↑↑↑ - ↑↑↑ ↑↑↑ timoresiske escudo timoresisk escudo ↑↑↑ - ↑↑↑ tyrkiske lire (1922–2005) tyrkisk lire (1922–2005) ↑↑↑ - ↑↑↑ tyrkiske lire tyrkisk lire ↑↑↑ - ↑↑↑ ↑↑↑ ↑↑↑ @@ -13522,7 +13290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ trinidadiske dollar trinidadisk dollar ↑↑↑ - ↑↑↑ ↑↑↑ @@ -13536,32 +13303,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 @@ -13574,57 +13336,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikanske dollar (neste dag) amerikansk dollar (neste dag) ↑↑↑ - ↑↑↑ amerikanske dollar (samme dag) amerikansk dollar (samme dag) ↑↑↑ - ↑↑↑ uruguyanske pesos (indekserte enheter) ↑↑↑ ↑↑↑ - ↑↑↑ 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 @@ -13637,19 +13390,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 @@ -13661,37 +13411,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sølv unse sølv unser sølv - ↑↑↑ gull unse gull unser gull - ↑↑↑ 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 @@ -13704,37 +13448,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ spesielle trekkrettigheter spesiell trekkrettighet ↑↑↑ - ↑↑↑ europeisk valutaenhet europeisk valutaenhet europeiske valutaenheter - ↑↑↑ franske gullfranc fransk gullfranc ↑↑↑ - ↑↑↑ franske UIC-franc fransk UIC-franc ↑↑↑ - ↑↑↑ vestafrikanske CFA-franc vestafrikansk CFA-franc ↑↑↑ - ↑↑↑ palladium unse palladium unser palladium - ↑↑↑ CFP-franc @@ -13746,29 +13484,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ platina unse platina unser platina - ↑↑↑ RINET-fond - ↑↑↑ sucre ↑↑↑ ↑↑↑ - ↑↑↑ testvalutakode ↑↑↑ testvaluta - ↑↑↑ ADB-kontoenhet ADB-kontoenhet ADB-kontoenheter - ↑↑↑ ukjent valuta @@ -13780,87 +13513,73 @@ 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 jugoslavisk noviy-dinar ↑↑↑ - ↑↑↑ jugoslaviske konvertible dinarer jugoslavisk konvertibel dinar ↑↑↑ - ↑↑↑ jugoslaviske reformerte dinarer (1992–1993) jugoslavisk reformert dinar (1992–1993) ↑↑↑ - ↑↑↑ 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 zairisk zaire ↑↑↑ - ↑↑↑ zimbabwiske dollar (1980–2008) zimbabwisk dollar (1980–2008) ↑↑↑ - ↑↑↑ zimbabwisk dollar (2009) zimbabwisk dollar (2009) zimbabwiske dollar (2009) - ↑↑↑ zimbabwisk dollar (2008) 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..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,11 @@ 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(); pathsTemp.addAll(CONST_EXTRA_PATHS); paths = ImmutableSet.copyOf(pathsTemp); // preserves order (Sets.copyOf doesn't) @@ -276,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() + "\"]"); 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); } 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); }