stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Michael Fang 2011-04-19 10:55:46 -07:00
commit 07dada6d04
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties
View File

@ -65,6 +65,8 @@
# #
adp=Andorranische Pesete adp=Andorranische Pesete
aed=UAE Dirham aed=UAE Dirham
afa=Afghani (1927-2002)
afn=Afghani
all=Lek all=Lek
amd=Dram amd=Dram
ang=Niederl. Antillen Gulden ang=Niederl. Antillen Gulden
@ -85,6 +87,7 @@ bhd=Bahrain-Dinar
bif=Burundi-Franc bif=Burundi-Franc
bmd=Bermuda-Dollar bmd=Bermuda-Dollar
bnd=Brunei-Dollar bnd=Brunei-Dollar
bob=Boliviano
bov=Mvdol bov=Mvdol
brl=Real brl=Real
bsd=Bahama-Dollar bsd=Bahama-Dollar
@ -106,6 +109,7 @@ cup=Kubanischer Peso
cve=Kap Verde Escudo cve=Kap Verde Escudo
cyp=Zypern-Pfund cyp=Zypern-Pfund
czk=Tschechische Krone czk=Tschechische Krone
dem=Deutsche Mark
djf=Dschibuti-Franc djf=Dschibuti-Franc
dkk=D\u00e4nische Krone dkk=D\u00e4nische Krone
dop=Dominikanischer Peso dop=Dominikanischer Peso
@ -176,7 +180,9 @@ mro=Ouguiya
mtl=Maltesische Lira mtl=Maltesische Lira
mur=Mauritius-Rupie mur=Mauritius-Rupie
mvr=Rufiyaa mvr=Rufiyaa
mwk=Malawi Kwacha
mxn=Mexikanischer Peso mxn=Mexikanischer Peso
mxv=Mexican Unidad de Inversion (UDI)
myr=Malaysischer Ringgit myr=Malaysischer Ringgit
mzm=Alter Metical mzm=Alter Metical
mzn=Metical mzn=Metical
@ -217,6 +223,7 @@ sos=Somalia-Schilling
srd=Surinamischer Dollar srd=Surinamischer Dollar
srg=Suriname Gulden srg=Suriname Gulden
std=Dobra std=Dobra
svc=El Salvador Colon
syp=Syrisches Pfund syp=Syrisches Pfund
szl=Lilangeni szl=Lilangeni
thb=Baht thb=Baht

1
jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties
View File

@ -86,6 +86,7 @@ bhd=Dinaro del Bahraini
bif=Franco del Burundi bif=Franco del Burundi
bmd=Dollaro delle Bermuda bmd=Dollaro delle Bermuda
bnd=Dollaro del Brunei bnd=Dollaro del Brunei
bob=Boliviano
bov=Mvdol Boliviano bov=Mvdol Boliviano
brl=Real Brasiliano brl=Real Brasiliano
bsd=Dollaro delle Bahamas bsd=Dollaro delle Bahamas

4
jdk/test/java/util/Currency/CurrencyTest.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531 * @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531
* 6488442 * 6488442 7036905
* @summary Basic tests for Currency class. * @summary Basic tests for Currency class.
*/ */
@ -249,7 +249,7 @@ public class CurrencyTest {
testDisplayName("ITL", new Locale("it"), "Lira Italiana"); testDisplayName("ITL", new Locale("it"), "Lira Italiana");
testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186"); testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186");
testDisplayName("KRW", Locale.KOREAN, "\ub300\ud55c\ubbfc\uad6d \uc6d0"); 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("CNY", Locale.SIMPLIFIED_CHINESE, "\u4eba\u6c11\u5e01");
testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63"); testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63");
} }

11
jdk/test/sun/text/resources/LocaleData
View File

@ -6942,3 +6942,14 @@ CurrencyNames/zh_TW/xpt=\u94c2
CurrencyNames/zh_TW/xts=XTS CurrencyNames/zh_TW/xts=XTS
CurrencyNames/zh_TW/xxx=XXX CurrencyNames/zh_TW/xxx=XXX
CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5 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

2
jdk/test/sun/text/resources/LocaleDataTest.java
View File

@ -33,7 +33,7 @@
* 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 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 * @summary Verify locale data
* *
*/ */