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-12-15 11:29:58 -08:00
commit 638f43b009
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/share/classes/sun/text/resources/FormatData_bg.java
View File

@ -130,16 +130,16 @@ public class FormatData_bg extends ListResourceBundle {
}, },
{ "DateTimePatterns", { "DateTimePatterns",
new String[] { new String[] {
"HH:mm:ss z", // full time pattern "HH:mm:ss zzzz", // full time pattern
"HH:mm:ss z", // long time pattern "HH:mm:ss z", // long time pattern
"H:mm:ss", // medium time pattern "HH:mm:ss", // medium time pattern
"H:mm", // short time pattern "HH:mm", // short time pattern
"EEEE, yyyy, MMMM d", // full date pattern "dd MMMM y, EEEE", // full date pattern
"EEEE, yyyy, MMMM d", // long date pattern "dd MMMM y", // long date pattern
"yyyy-M-d", // medium date pattern "dd.MM.yyyy", // medium date pattern
"yy-M-d", // short date pattern "dd.MM.yy", // short date pattern
"{1} {0}" // date-time pattern "{1} {0}" // date-time pattern
} }
}, },
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
}; };

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

@ -7010,3 +7010,12 @@ CurrencyNames/zh_TW/zwl=\u8f9b\u5df4\u5a01\u5143 (2009)
# bug 7101495 # bug 7101495
CalendarData/lv/firstDayOfWeek=2 CalendarData/lv/firstDayOfWeek=2
CalendarData/lv/minimalDaysInFirstWeek=4 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

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

@ -34,6 +34,7 @@
* 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 7036905 7066203 7101495 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* 7003124
* @summary Verify locale data * @summary Verify locale data
* *
*/ */