diff --git a/src/share/classes/sun/util/resources/CurrencyNames_de.properties b/src/share/classes/sun/util/resources/CurrencyNames_de.properties index b77e202a121bee319901f42a3fcd05ccf30986cd..5e8f14b8de1e0087d1b22914cddb3ae7019eda2c 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_de.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_de.properties @@ -65,6 +65,8 @@ # adp=Andorranische Pesete aed=UAE Dirham +afa=Afghani (1927-2002) +afn=Afghani all=Lek amd=Dram ang=Niederl. Antillen Gulden @@ -85,6 +87,7 @@ bhd=Bahrain-Dinar bif=Burundi-Franc bmd=Bermuda-Dollar bnd=Brunei-Dollar +bob=Boliviano bov=Mvdol brl=Real bsd=Bahama-Dollar @@ -106,6 +109,7 @@ cup=Kubanischer Peso cve=Kap Verde Escudo cyp=Zypern-Pfund czk=Tschechische Krone +dem=Deutsche Mark djf=Dschibuti-Franc dkk=D\u00e4nische Krone dop=Dominikanischer Peso @@ -176,7 +180,9 @@ mro=Ouguiya mtl=Maltesische Lira mur=Mauritius-Rupie mvr=Rufiyaa +mwk=Malawi Kwacha mxn=Mexikanischer Peso +mxv=Mexican Unidad de Inversion (UDI) myr=Malaysischer Ringgit mzm=Alter Metical mzn=Metical @@ -217,6 +223,7 @@ sos=Somalia-Schilling srd=Surinamischer Dollar srg=Suriname Gulden std=Dobra +svc=El Salvador Colon syp=Syrisches Pfund szl=Lilangeni thb=Baht diff --git a/src/share/classes/sun/util/resources/CurrencyNames_it.properties b/src/share/classes/sun/util/resources/CurrencyNames_it.properties index b2953430b5a77477bc11df83063a67de3a3fb58a..9e3ad2a2ff2090d529d127c5d27ab70462f6eaca 100644 --- a/src/share/classes/sun/util/resources/CurrencyNames_it.properties +++ b/src/share/classes/sun/util/resources/CurrencyNames_it.properties @@ -86,6 +86,7 @@ bhd=Dinaro del Bahraini bif=Franco del Burundi bmd=Dollaro delle Bermuda bnd=Dollaro del Brunei +bob=Boliviano bov=Mvdol Boliviano brl=Real Brasiliano bsd=Dollaro delle Bahamas diff --git a/test/java/util/Currency/CurrencyTest.java b/test/java/util/Currency/CurrencyTest.java index c3a3be4ad701540e16f15e8a25619a8bb2dfa501..e7ae4fd79fc5d324e06ac3df81b22b6570a36070 100644 --- a/test/java/util/Currency/CurrencyTest.java +++ b/test/java/util/Currency/CurrencyTest.java @@ -23,7 +23,7 @@ /* * @test * @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531 - * 6488442 + * 6488442 7036905 * @summary Basic tests for Currency class. */ @@ -249,7 +249,7 @@ public class CurrencyTest { testDisplayName("ITL", new Locale("it"), "Lira Italiana"); testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186"); testDisplayName("KRW", Locale.KOREAN, "\ub300\ud55c\ubbfc\uad6d \uc6d0"); - testDisplayName("SEK", new Locale("sv"), "Svensk krona"); + testDisplayName("SEK", new Locale("sv"), "svensk krona"); testDisplayName("CNY", Locale.SIMPLIFIED_CHINESE, "\u4eba\u6c11\u5e01"); testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63"); } diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index 9507873623385b6777e6b207ca6a8a415534a2fb..a3d7088e35d96958425f98fa9f75a03f88e3f70c 100644 --- a/test/sun/text/resources/LocaleData +++ b/test/sun/text/resources/LocaleData @@ -6942,3 +6942,14 @@ CurrencyNames/zh_TW/xpt=\u94c2 CurrencyNames/zh_TW/xts=XTS CurrencyNames/zh_TW/xxx=XXX CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5 + +# bug 7036905 +CurrencyNames/de/afa=Afghani (1927-2002) +CurrencyNames/de/afn=Afghani +CurrencyNames/de/bob=Boliviano +CurrencyNames/de/dem=Deutsche Mark +CurrencyNames/de/mwk=Malawi Kwacha +CurrencyNames/de/mxv=Mexican Unidad de Inversion (UDI) +CurrencyNames/de/svc=El Salvador Colon + +CurrencyNames/it/bob=Boliviano diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java index 1b7d80ef78d56f3c590283f4395dccd78d6134fb..5b5f4d7b6dc72a072da0b6c27ce2962ef9c2c5f7 100644 --- a/test/sun/text/resources/LocaleDataTest.java +++ b/test/sun/text/resources/LocaleDataTest.java @@ -33,7 +33,7 @@ * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 - * 6919624 6998391 7019267 7020960 7025837 7020583 + * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 * @summary Verify locale data * */