diff --git a/src/share/classes/sun/text/resources/FormatData_fr.java b/src/share/classes/sun/text/resources/FormatData_fr.java index dfbbd1948a5b359b1e1c8842b80f779233562903..210f184308b5aaee5b49af9c368cc533a09fefe6 100644 --- a/src/share/classes/sun/text/resources/FormatData_fr.java +++ b/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/src/share/classes/sun/text/resources/FormatData_fr_BE.java b/src/share/classes/sun/text/resources/FormatData_fr_BE.java index c78c1443285436d763c7f43841f9f9a90d7a42e0..3e158a7fb6b0f418f66e5c922c024be7538ef842 100644 --- a/src/share/classes/sun/text/resources/FormatData_fr_BE.java +++ b/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/src/share/classes/sun/text/resources/FormatData_fr_CA.java b/src/share/classes/sun/text/resources/FormatData_fr_CA.java index 13b66143bbe787b2e65a80e85c751d5f1a509f25..bffac2018c9a5b75f660a926ea108377bf9b3fbd 100644 --- a/src/share/classes/sun/text/resources/FormatData_fr_CA.java +++ b/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/src/share/classes/sun/text/resources/FormatData_fr_CH.java b/src/share/classes/sun/text/resources/FormatData_fr_CH.java index cc3ee298a3224d016fb7849bc7787325664376c1..7ce951ab65939fcc489a5f2c2dd07af187673f0b 100644 --- a/src/share/classes/sun/text/resources/FormatData_fr_CH.java +++ b/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/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index bf609d108b78b15b1a2f259ab8c4f998acd5b181..090b73c8d12c7388725c0d468d99da7e00ce6782 100644 --- a/test/sun/text/resources/LocaleData +++ b/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 %