From 28ced6a8e34ae03dff54c51b661a9e89e39606a7 Mon Sep 17 00:00:00 2001 From: Jiri Tusla Date: Fri, 1 Aug 2008 01:46:31 -0700 Subject: [PATCH] 6509039: Swedish localization has incorrect am/pm markers in FormatData_sv Added respective section Reviewed-by: peytoia, jenda --- jdk/src/share/classes/sun/text/resources/FormatData_sv.java | 6 ++++++ jdk/test/sun/text/resources/LocaleData | 4 ++++ jdk/test/sun/text/resources/LocaleDataTest.java | 1 + 3 files changed, 11 insertions(+) diff --git a/jdk/src/share/classes/sun/text/resources/FormatData_sv.java b/jdk/src/share/classes/sun/text/resources/FormatData_sv.java index a5f25230202..f02245a55da 100644 --- a/jdk/src/share/classes/sun/text/resources/FormatData_sv.java +++ b/jdk/src/share/classes/sun/text/resources/FormatData_sv.java @@ -104,6 +104,12 @@ public class FormatData_sv extends ListResourceBundle { "l\u00f6" // abb Saturday } }, + { "AmPmMarkers", + new String[] { + "fm", // am marker + "em" // pm marker + } + }, { "NumberElements", new String[] { ",", // decimal separator diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData index 5c4e65760ec..f885bbeb2db 100644 --- a/jdk/test/sun/text/resources/LocaleData +++ b/jdk/test/sun/text/resources/LocaleData @@ -5514,3 +5514,7 @@ CurrencyNames/ar_SD/SDG=\u062c.\u0633.\u200f # bug 6531593 FormatData/is_IS/NumberPatterns/1=#,##0. \u00A4;-#,##0. \u00A4 +# bug 6509039 +FormatData/sv/AmPmMarkers/0=fm +FormatData/sv/AmPmMarkers/1=em + diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java index 70fd1828a28..ff36327ea77 100644 --- a/jdk/test/sun/text/resources/LocaleDataTest.java +++ b/jdk/test/sun/text/resources/LocaleDataTest.java @@ -31,6 +31,7 @@ * 5102005 5074431 6182685 6208712 6277020 6245766 6351682 6386647 6379382 * 6414459 6455680 6498742 6558863 6488119 6547501 6497154 6558856 6481177 * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 + * 6509039 * @summary Verify locale data * */