From 47266178368176aae1c656945613554db4f7af3f Mon Sep 17 00:00:00 2001 From: yhuang Date: Wed, 12 Jun 2013 23:54:55 -0700 Subject: [PATCH] 7040556: SimpleDateFormat.format Portuguese Month should not be capitalized Reviewed-by: okutsu --- .../sun/text/resources/pt/FormatData_pt.java | 24 +++++++++---------- test/sun/text/resources/LocaleData | 18 +++++++++++--- test/sun/text/resources/LocaleDataTest.java | 2 +- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/share/classes/sun/text/resources/pt/FormatData_pt.java b/src/share/classes/sun/text/resources/pt/FormatData_pt.java index ec36c0c70..32e6c1e14 100644 --- a/src/share/classes/sun/text/resources/pt/FormatData_pt.java +++ b/src/share/classes/sun/text/resources/pt/FormatData_pt.java @@ -103,18 +103,18 @@ public class FormatData_pt extends ParallelListResourceBundle { }, { "MonthAbbreviations", new String[] { - "Jan", // abb january - "Fev", // abb february - "Mar", // abb march - "Abr", // abb april - "Mai", // abb may - "Jun", // abb june - "Jul", // abb july - "Ago", // abb august - "Set", // abb september - "Out", // abb october - "Nov", // abb november - "Dez", // abb december + "jan", // abb january + "fev", // abb february + "mar", // abb march + "abr", // abb april + "mai", // abb may + "jun", // abb june + "jul", // abb july + "ago", // abb august + "set", // abb september + "out", // abb october + "nov", // abb november + "dez", // abb december "" // abb month 13 if applicable } }, diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index 7d95a57d7..91d4c46b8 100644 --- a/test/sun/text/resources/LocaleData +++ b/test/sun/text/resources/LocaleData @@ -28,9 +28,6 @@ FormatData/pt_BR/DateTimePatterns/0={1} {0} FormatData/pt_BR/NumberElements/0=, FormatData/pt_BR/NumberElements/1=. FormatData/pt_BR/NumberElements/2=; -FormatData/pt_BR/MonthAbbreviations/0=Jan -FormatData/pt_BR/MonthAbbreviations/1=Fev -FormatData/pt_BR/MonthAbbreviations/2=Mar FormatData/pt_BR/DayAbbreviations/0=Dom FormatData/pt_BR/DayAbbreviations/1=Seg FormatData/pt_BR/DayAbbreviations/2=Ter @@ -7667,3 +7664,18 @@ LocaleNames/sq/sq=shqip # bug 7074882 FormatData/mt/MonthNames/7=Awwissu FormatData/mt/MonthAbbreviations/7=Aww + +# bug 7040556 +FormatData/pt/MonthAbbreviations/0=jan +FormatData/pt/MonthAbbreviations/1=fev +FormatData/pt/MonthAbbreviations/2=mar +FormatData/pt/MonthAbbreviations/3=abr +FormatData/pt/MonthAbbreviations/4=mai +FormatData/pt/MonthAbbreviations/5=jun +FormatData/pt/MonthAbbreviations/6=jul +FormatData/pt/MonthAbbreviations/7=ago +FormatData/pt/MonthAbbreviations/8=set +FormatData/pt/MonthAbbreviations/9=out +FormatData/pt/MonthAbbreviations/10=nov +FormatData/pt/MonthAbbreviations/11=dez + diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java index ca5d7fee1..73cd7e805 100644 --- a/test/sun/text/resources/LocaleDataTest.java +++ b/test/sun/text/resources/LocaleDataTest.java @@ -35,7 +35,7 @@ * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 - * 7114053 7074882 + * 7114053 7074882 7040556 * @summary Verify locale data * */ -- GitLab