From 343a1f81dfc36dc7d4f441886c07a06a406a9b1f Mon Sep 17 00:00:00 2001
From: katakai <unknown>
Date: Sun, 7 Nov 2010 19:48:25 -0800
Subject: [PATCH] 4225362: localized DateFormatSymbols for fr_FR is wrong
 Reviewed-by: yhuang, peytoia

---
 .../classes/sun/text/resources/FormatData_fr.java    |  2 +-
 .../classes/sun/text/resources/FormatData_fr_BE.java |  2 +-
 .../classes/sun/text/resources/FormatData_fr_CA.java |  2 +-
 .../classes/sun/text/resources/FormatData_fr_CH.java |  2 +-
 test/sun/text/resources/LocaleData                   | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/share/classes/sun/text/resources/FormatData_fr.java b/src/share/classes/sun/text/resources/FormatData_fr.java
index dfbbd1948..210f18430 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 c78c14432..3e158a7fb 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 13b66143b..bffac2018 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 cc3ee298a..7ce951ab6 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 bf609d108..090b73c8d 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 %
-- 
GitLab