7037368: Currency names missing in some locales
Reviewed-by: naoto
Contributed-by: li.jiang@oracle.com
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties Wed Nov 30 07:51:40 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -210,6 +210,7 @@
rub=Russischer Rubel (neu)
rur=Russischer Rubel (alt)
rwf=Ruanda-Franc
+sar=Saudi-Rial
sbd=Salomonen-Dollar
scr=Seychellen-Rupie
sdd=Sudanesischer Dinar
@@ -264,6 +265,7 @@
xfu=Franz\u00f6sischer UIC-Franc
xof=CFA Franc (West)
xpd=Unze Palladium
+xpf=CFP-Franc
xpt=Unze Platin
xts=Testw\u00e4hrung
xxx=Unbekannte W\u00e4hrung
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_it.properties Wed Nov 30 07:51:40 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,7 @@
aud=Dollaro Australiano
awg=Fiorino di Aruba
azm=Manat Azero (1993-2006)
+azn=manat azero
bam=Marco Conv. Bosnia-Erzegovina
bbd=Dollaro di Barbados
bdt=Taka Bangladese
@@ -201,6 +202,7 @@
pyg=Guarani del Paraguay
qar=Rial del Qatar
rol=Leu della Romania
+ron=leu rumeno
rsd=Dinaro serbo
rub=Rublo Russo
rur=Rublo della CSI
@@ -229,7 +231,8 @@
tnd=Dinaro Tunisino
top=Pa\u02bbanga di Tonga
tpe=Escudo di Timor
-trl=Lira Turca
+trl=lira turca (1922-2005)
+try=lira turca
ttd=Dollaro di Trinidad e Tobago
twd=Nuovo dollaro taiwanese
tzs=Scellino della Tanzania
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_sv.properties Wed Nov 30 07:51:40 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,7 @@
bbd=Barbados-dollar
bdt=bangladeshisk taka
bef=belgisk franc
+bgl=bulgarisk h\u00e5rd lev (1962–1999)
bgn=bulgarisk ny lev
bhd=Bahrain-dinar
bif=burundisk franc
@@ -250,6 +251,7 @@
vnd=vietnamesisk dong
vuv=vanuatisk vatu
wst=v\u00e4stsamoansk tala
+xaf=centralafrikansk franc
xag=silver
xau=guld
xba=europeisk kompositenhet
@@ -259,6 +261,8 @@
xcd=\u00f6stkaribisk dollar
xdr=IMF s\u00e4rskild dragningsr\u00e4tt
xfo=fransk guldfranc
+xfu=internationella j\u00e4rnv\u00e4gsunionens franc
+xof=v\u00e4stafrikansk franc
xpd=palladium
xpf=CFP-franc
xpt=platina
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties Wed Nov 30 07:51:40 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -216,6 +216,7 @@
sbd=\u6240\u7f57\u95e8\u7fa4\u5c9b\u5143
scr=\u585e\u820c\u5c14\u5362\u6bd4
sdd=\u82cf\u4e39\u7b2c\u7eb3\u5c14
+sdg=\u82cf\u4e39\u9551
sek=\u745e\u5178\u514b\u6717
sgd=\u65b0\u52a0\u5761\u5143
shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
--- a/jdk/test/sun/text/resources/LocaleData Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/test/sun/text/resources/LocaleData Wed Nov 30 07:51:40 2016 -0800
@@ -8286,6 +8286,19 @@
# bug #8129361
CurrencyNames//hrk=Kuna
+# bug #7037368
+CurrencyNames/de/sar=Saudi-Rial
+CurrencyNames/de/xpf=CFP-Franc
+CurrencyNames/it/azn=manat azero
+CurrencyNames/it/ron=leu rumeno
+CurrencyNames/it/trl=lira turca (1922-2005)
+CurrencyNames/it/try=lira turca
+CurrencyNames/sv/bgl=bulgarisk h\u00e5rd lev (1962–1999)
+CurrencyNames/sv/xaf=centralafrikansk franc
+CurrencyNames/sv/xfu=internationella j\u00e4rnv\u00e4gsunionens franc
+CurrencyNames/sv/xof=v\u00e4stafrikansk franc
+CurrencyNames/zh_CN/sdg=\u82cf\u4e39\u9551
+
# bug #8164784
CurrencyNames//mwk=Malawian Malawi Kwacha
CurrencyNames//pen=Peruvian Sol
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Wed Dec 07 17:15:03 2016 -0800
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Wed Nov 30 07:51:40 2016 -0800
@@ -37,7 +37,7 @@
* 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
* 7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
* 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
- * 8145136 8145952 8164784 8037111 8081643
+ * 8145136 8145952 8164784 8037111 8081643 7037368
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata