Mercurial > hg > icedtea9-forest > jdk
changeset 5883:e8569a473cee jdk8-b52
Merge
author | katleman |
---|---|
date | Wed, 15 Aug 2012 18:04:14 -0700 |
parents | 865c411ebcae (current diff) 90a9acfde9e6 (diff) |
children | 2c6933c5106b |
files | |
diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties Fri Aug 10 16:03:28 2012 -0700 +++ b/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties Wed Aug 15 18:04:14 2012 -0700 @@ -36,5 +36,5 @@ # Taligent is a registered trademark of Taligent, Inc. VEB=Bs -VEF=BsF. +VEF=Bs.F.
--- a/test/sun/text/resources/LocaleData Fri Aug 10 16:03:28 2012 -0700 +++ b/test/sun/text/resources/LocaleData Wed Aug 15 18:04:14 2012 -0700 @@ -655,7 +655,6 @@ FormatData/es_UY/NumberElements/2=; CurrencyNames/es_VE/VEB=Bs # bug 6570259 -CurrencyNames/es_VE/VEF=BsF. FormatData/es_VE/NumberPatterns/0=#,##0.###;-#,##0.### # FormatData/es_VE/NumberPatterns/1=Bs#,##0.00;Bs -#,##0.00 # Changed; see bug 4122840 FormatData/es_VE/NumberPatterns/2=#,##0% @@ -7034,3 +7033,5 @@ FormatData/sl/DateTimePatterns/4=EEEE, dd. MMMM y FormatData/sl/DateTimePatterns/5=dd. MMMM y +# bug 7189611 +CurrencyNames/es_VE/VEF=Bs.F.
--- a/test/sun/text/resources/LocaleDataTest.java Fri Aug 10 16:03:28 2012 -0700 +++ b/test/sun/text/resources/LocaleDataTest.java Wed Aug 15 18:04:14 2012 -0700 @@ -34,7 +34,7 @@ * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 - * 7003124 7085757 7028073 7171028 + * 7003124 7085757 7028073 7171028 7189611 * @summary Verify locale data * */