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 a5f25230202fef36232c07765ca9566c3a2cbf8b..f02245a55da84c904791f8f4c512824e36414cf1 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 5c4e65760ece35095866ee089428e78cdd01c5fe..f885bbeb2db4ba603f4e1a544f46d6d63f740905 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 70fd1828a2862ad8e916c2d3e8f0f6a5ef7bc3e5..ff36327ea772de3cda941797aa361ef43f818855 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 * */