diff --git a/jdk/src/share/classes/sun/text/resources/FormatData_fr.java b/jdk/src/share/classes/sun/text/resources/FormatData_fr.java index dfbbd1948a5..210f184308b 100644 --- a/jdk/src/share/classes/sun/text/resources/FormatData_fr.java +++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr.java @@ -145,7 +145,7 @@ public class FormatData_fr extends ListResourceBundle { "{1} {0}" // date-time pattern } }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" }, + { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, }; } } diff --git a/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java b/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java index c78c1443285..3e158a7fb6b 100644 --- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java +++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_BE.java @@ -76,7 +76,7 @@ public class FormatData_fr_BE extends ListResourceBundle { "{1} {0}" // date-time pattern } }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" }, + { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, }; } } diff --git a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java index 13b66143bbe..bffac2018c9 100644 --- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java +++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CA.java @@ -68,7 +68,7 @@ public class FormatData_fr_CA extends ListResourceBundle { "{1} {0}" // date-time pattern } }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" }, + { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, }; } } diff --git a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java index cc3ee298a32..7ce951ab659 100644 --- a/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java +++ b/jdk/src/share/classes/sun/text/resources/FormatData_fr_CH.java @@ -83,7 +83,7 @@ public class FormatData_fr_CH extends ListResourceBundle { "{1} {0}" // date-time pattern } }, - { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" }, + { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" }, }; } } diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData index bf609d108b7..090b73c8d12 100644 --- a/jdk/test/sun/text/resources/LocaleData +++ b/jdk/test/sun/text/resources/LocaleData @@ -5468,12 +5468,12 @@ LocaleNames/fr/GF=Guyane fran\u00e7aise LocaleNames/fr/GY=Guyana # bug 4225362 -FormatData/fr/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ -FormatData/fr_BE/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ -FormatData/fr_CA/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ -FormatData/fr_CH/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ -FormatData/fr_FR/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ -FormatData/fr_LU/DateTimePatternChars=GaMjkHmsSEDFwWahKzZ +FormatData/fr/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ +FormatData/fr_BE/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ +FormatData/fr_CA/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ +FormatData/fr_CH/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ +FormatData/fr_FR/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ +FormatData/fr_LU/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ # bug 6547501 FormatData/fr/NumberPatterns/2=#,##0 %