提交 d698369d 编写于 作者: O okutsu

8074791: Long-form date format incorrect month string for Finnish locale

Reviewed-by: naoto
上级 50e86bed
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -295,8 +295,8 @@ public class FormatData_fi extends ParallelListResourceBundle { ...@@ -295,8 +295,8 @@ public class FormatData_fi extends ParallelListResourceBundle {
}, },
{ "DatePatterns", { "DatePatterns",
new String[] { new String[] {
"d. MMMM'ta 'yyyy", // full date pattern "d. MMMM yyyy", // full date pattern
"d. MMMM'ta 'yyyy", // long date pattern "d. MMMM yyyy", // long date pattern
"d.M.yyyy", // medium date pattern "d.M.yyyy", // medium date pattern
"d.M.yyyy", // short date pattern "d.M.yyyy", // short date pattern
} }
......
/*
* Copyright (c) 2015, 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.
*
* 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.
*/
/*
* @test
* @bug 8074791
* @summary Make sure that Finnish month names are correct in formatted text.
*/
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import static java.text.DateFormat.*;
import static java.util.Calendar.JANUARY;
public class Bug8074791 {
private static Locale FINNISH = new Locale("fi");
private static String JAN_FORMAT = "tammikuuta";
private static String JAN_STANDALONE = "tammikuu";
public static void main(String[] arg) {
int errors = 0;
DateFormat df = DateFormat.getDateInstance(LONG, FINNISH);
Date jan20 = new GregorianCalendar(2015, JANUARY, 20).getTime();
String str = df.format(jan20).toString();
// Extract the month name (locale data dependent)
String month = str.replaceAll(".+\\s([a-z]+)\\s\\d+$", "$1");
if (!month.equals(JAN_FORMAT)) {
errors++;
System.err.println("wrong format month name: got '" + month
+ "', expected '" + JAN_FORMAT + "'");
}
SimpleDateFormat sdf = new SimpleDateFormat("LLLL", FINNISH); // stand-alone month name
month = sdf.format(jan20);
if (!month.equals(JAN_STANDALONE)) {
errors++;
System.err.println("wrong stand-alone month name: got '" + month
+ "', expected '" + JAN_STANDALONE + "'");
}
if (errors > 0) {
throw new RuntimeException();
}
}
}
...@@ -8276,3 +8276,9 @@ FormatData/zh/MonthNarrows/9=10 ...@@ -8276,3 +8276,9 @@ FormatData/zh/MonthNarrows/9=10
FormatData/zh/MonthNarrows/10=11 FormatData/zh/MonthNarrows/10=11
FormatData/zh/MonthNarrows/11=12 FormatData/zh/MonthNarrows/11=12
FormatData/zh/MonthNarrows/12= FormatData/zh/MonthNarrows/12=
# bug #8074791
FormatData/fi/DatePatterns/0=d. MMMM yyyy
FormatData/fi/DatePatterns/1=d. MMMM yyyy
FormatData/fi/DatePatterns/2=d.M.yyyy
FormatData/fi/DatePatterns/3=d.M.yyyy
/* /*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
* 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826 * 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
* 8017142 8037343 8055222 8042126 * 8017142 8037343 8055222 8042126 8074791
* @summary Verify locale data * @summary Verify locale data
* *
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册