Merge jdk8-b19
authorkatleman
Wed, 28 Dec 2011 15:14:24 -0800
changeset 49013778f8577305
parent 4898 6f19ff39cff4
parent 4900 cd03cd0e0965
child 4902 80350ee39fa8
Merge
     1.1 --- a/src/share/classes/sun/text/resources/FormatData_bg.java	Fri Dec 23 16:38:34 2011 -0800
     1.2 +++ b/src/share/classes/sun/text/resources/FormatData_bg.java	Wed Dec 28 15:14:24 2011 -0800
     1.3 @@ -130,16 +130,16 @@
     1.4              },
     1.5              { "DateTimePatterns",
     1.6                  new String[] {
     1.7 -                    "HH:mm:ss z", // full time pattern
     1.8 +                    "HH:mm:ss zzzz", // full time pattern
     1.9                      "HH:mm:ss z", // long time pattern
    1.10 -                    "H:mm:ss", // medium time pattern
    1.11 -                    "H:mm", // short time pattern
    1.12 -                    "EEEE, yyyy, MMMM d", // full date pattern
    1.13 -                    "EEEE, yyyy, MMMM d", // long date pattern
    1.14 -                    "yyyy-M-d", // medium date pattern
    1.15 -                    "yy-M-d", // short date pattern
    1.16 +                    "HH:mm:ss", // medium time pattern
    1.17 +                    "HH:mm", // short time pattern
    1.18 +                    "dd MMMM y, EEEE", // full date pattern
    1.19 +                    "dd MMMM y", // long date pattern
    1.20 +                    "dd.MM.yyyy", // medium date pattern
    1.21 +                    "dd.MM.yy", // short date pattern
    1.22                      "{1} {0}" // date-time pattern
    1.23 -                }
    1.24 +                             }
    1.25              },
    1.26              { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
    1.27          };
     2.1 --- a/test/sun/text/resources/LocaleData	Fri Dec 23 16:38:34 2011 -0800
     2.2 +++ b/test/sun/text/resources/LocaleData	Wed Dec 28 15:14:24 2011 -0800
     2.3 @@ -7010,3 +7010,12 @@
     2.4  # bug 7101495
     2.5  CalendarData/lv/firstDayOfWeek=2
     2.6  CalendarData/lv/minimalDaysInFirstWeek=4
     2.7 +
     2.8 +# bug 7003124
     2.9 +FormatData/bg/DateTimePatterns/0=HH:mm:ss zzzz
    2.10 +FormatData/bg/DateTimePatterns/2=HH:mm:ss
    2.11 +FormatData/bg/DateTimePatterns/3=HH:mm
    2.12 +FormatData/bg/DateTimePatterns/4=dd MMMM y, EEEE
    2.13 +FormatData/bg/DateTimePatterns/5=dd MMMM y
    2.14 +FormatData/bg/DateTimePatterns/6=dd.MM.yyyy
    2.15 +FormatData/bg/DateTimePatterns/7=dd.MM.yy
     3.1 --- a/test/sun/text/resources/LocaleDataTest.java	Fri Dec 23 16:38:34 2011 -0800
     3.2 +++ b/test/sun/text/resources/LocaleDataTest.java	Wed Dec 28 15:14:24 2011 -0800
     3.3 @@ -34,6 +34,7 @@
     3.4   *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
     3.5   *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
     3.6   *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
     3.7 + *      7003124
     3.8   * @summary Verify locale data
     3.9   *
    3.10   */