changeset 2957:1bebd1f9445b

4225362: localized DateFormatSymbols for fr_FR is wrong Reviewed-by: yhuang, peytoia
author katakai
date Sun, 07 Nov 2010 19:48:25 -0800
parents 9c4165d5661c
children 0660c48dd705
files src/share/classes/sun/text/resources/FormatData_fr.java src/share/classes/sun/text/resources/FormatData_fr_BE.java src/share/classes/sun/text/resources/FormatData_fr_CA.java src/share/classes/sun/text/resources/FormatData_fr_CH.java test/sun/text/resources/LocaleData
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/text/resources/FormatData_fr.java	Thu Oct 21 17:12:41 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr.java	Sun Nov 07 19:48:25 2010 -0800
@@ -145,7 +145,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
--- a/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Thu Oct 21 17:12:41 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Sun Nov 07 19:48:25 2010 -0800
@@ -76,7 +76,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
--- a/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Thu Oct 21 17:12:41 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Sun Nov 07 19:48:25 2010 -0800
@@ -68,7 +68,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
--- a/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Thu Oct 21 17:12:41 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Sun Nov 07 19:48:25 2010 -0800
@@ -83,7 +83,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
--- a/test/sun/text/resources/LocaleData	Thu Oct 21 17:12:41 2010 -0700
+++ b/test/sun/text/resources/LocaleData	Sun Nov 07 19:48:25 2010 -0800
@@ -5468,12 +5468,12 @@
 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 %