Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 7829:61d15f512305 jdk7u65-b12
8013836: getFirstDayOfWeek reports wrong day for pt-BR locale
Reviewed-by: naoto
author | yhuang |
---|---|
date | Tue, 06 May 2014 22:15:25 -0700 |
parents | ab610f5627c7 |
children | 34ae1d13a333 8fb48ea28c3a |
files | make/java/util/FILES_properties.gmk src/share/classes/sun/util/resources/CalendarData_pt_BR.properties test/sun/text/resources/LocaleData test/sun/text/resources/LocaleDataTest.java |
diffstat | 4 files changed, 45 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/util/FILES_properties.gmk Thu May 08 12:00:26 2014 -0700 +++ b/make/java/util/FILES_properties.gmk Tue May 06 22:15:25 2014 -0700 @@ -107,6 +107,7 @@ sun/util/resources/CalendarData_pl.properties \ sun/util/resources/CalendarData_pt.properties \ sun/util/resources/CalendarData_pt_PT.properties \ + sun/util/resources/CalendarData_pt_BR.properties \ sun/util/resources/CalendarData_ro.properties \ sun/util/resources/CalendarData_ru.properties \ sun/util/resources/CalendarData_sk.properties \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties Tue May 06 22:15:25 2014 -0700 @@ -0,0 +1,40 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved +# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved +# +# The original version of this source code and documentation +# is copyrighted and owned by Taligent, Inc., a wholly-owned +# subsidiary of IBM. These materials are provided under terms +# of a License Agreement between Taligent and Sun. This technology +# is protected by multiple US and International patents. +# +# This notice and attribution to Taligent may not be removed. +# Taligent is a registered trademark of Taligent, Inc. + + +firstDayOfWeek=1 +minimalDaysInFirstWeek=1
--- a/test/sun/text/resources/LocaleData Thu May 08 12:00:26 2014 -0700 +++ b/test/sun/text/resources/LocaleData Tue May 06 22:15:25 2014 -0700 @@ -11,7 +11,7 @@ # bug #4052679 LocaleNames/fr/fr=fran\u00e7ais -# bug #4055602, 4290801 +# bug #4055602, 4290801, 8013836 CurrencyNames/pt_BR/BRL=R$ FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.### # FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840 @@ -37,7 +37,7 @@ FormatData/pt_BR/DayNames/0=Domingo FormatData/pt_BR/DayNames/1=Segunda-feira FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira -CalendarData/pt_BR/firstDayOfWeek=2 +CalendarData/pt_BR/firstDayOfWeek=1 CalendarData/pt_BR/minimalDaysInFirstWeek=1 FormatData/pt_BR/MonthNames/0=Janeiro FormatData/pt_BR/MonthNames/1=Fevereiro
--- a/test/sun/text/resources/LocaleDataTest.java Thu May 08 12:00:26 2014 -0700 +++ b/test/sun/text/resources/LocaleDataTest.java Tue May 06 22:15:25 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -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 7189611 - * 7171028 + * 7171028 8013836 * @summary Verify locale data * */