Mercurial > hg > openjdk > jdk8 > jdk
changeset 4866:3778f8577305 jdk8-b19
Merge
author | katleman |
---|---|
date | Wed, 28 Dec 2011 15:14:24 -0800 |
parents | 6f19ff39cff4 (current diff) cd03cd0e0965 (diff) |
children | 80350ee39fa8 |
files | |
diffstat | 3 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/text/resources/FormatData_bg.java Fri Dec 23 16:38:34 2011 -0800 +++ b/src/share/classes/sun/text/resources/FormatData_bg.java Wed Dec 28 15:14:24 2011 -0800 @@ -130,16 +130,16 @@ }, { "DateTimePatterns", new String[] { - "HH:mm:ss z", // full time pattern + "HH:mm:ss zzzz", // full time pattern "HH:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - "EEEE, yyyy, MMMM d", // full date pattern - "EEEE, yyyy, MMMM d", // long date pattern - "yyyy-M-d", // medium date pattern - "yy-M-d", // short date pattern + "HH:mm:ss", // medium time pattern + "HH:mm", // short time pattern + "dd MMMM y, EEEE", // full date pattern + "dd MMMM y", // long date pattern + "dd.MM.yyyy", // medium date pattern + "dd.MM.yy", // short date pattern "{1} {0}" // date-time pattern - } + } }, { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, };
--- a/test/sun/text/resources/LocaleData Fri Dec 23 16:38:34 2011 -0800 +++ b/test/sun/text/resources/LocaleData Wed Dec 28 15:14:24 2011 -0800 @@ -7010,3 +7010,12 @@ # bug 7101495 CalendarData/lv/firstDayOfWeek=2 CalendarData/lv/minimalDaysInFirstWeek=4 + +# bug 7003124 +FormatData/bg/DateTimePatterns/0=HH:mm:ss zzzz +FormatData/bg/DateTimePatterns/2=HH:mm:ss +FormatData/bg/DateTimePatterns/3=HH:mm +FormatData/bg/DateTimePatterns/4=dd MMMM y, EEEE +FormatData/bg/DateTimePatterns/5=dd MMMM y +FormatData/bg/DateTimePatterns/6=dd.MM.yyyy +FormatData/bg/DateTimePatterns/7=dd.MM.yy
--- a/test/sun/text/resources/LocaleDataTest.java Fri Dec 23 16:38:34 2011 -0800 +++ b/test/sun/text/resources/LocaleDataTest.java Wed Dec 28 15:14:24 2011 -0800 @@ -34,6 +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 * @summary Verify locale data * */