changeset 2959:565be51eb60e

Merge
author cl
date Tue, 09 Nov 2010 11:45:00 -0800
parents d87c1c06bbf9 0660c48dd705
children bb30977193b0 beb9f3298ad3
files
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/text/resources/FormatData_fr.java	Thu Nov 04 15:54:34 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr.java	Tue Nov 09 11:45:00 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 Nov 04 15:54:34 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_BE.java	Tue Nov 09 11:45:00 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 Nov 04 15:54:34 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_CA.java	Tue Nov 09 11:45:00 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 Nov 04 15:54:34 2010 -0700
+++ b/src/share/classes/sun/text/resources/FormatData_fr_CH.java	Tue Nov 09 11:45:00 2010 -0800
@@ -83,7 +83,7 @@
                     "{1} {0}" // date-time pattern
                 }
             },
-            { "DateTimePatternChars", "GaMjkHmsSEDFwWahKzZ" },
+            { "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
         };
     }
 }
--- a/test/sun/text/resources/LocaleData	Thu Nov 04 15:54:34 2010 -0700
+++ b/test/sun/text/resources/LocaleData	Tue Nov 09 11:45:00 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 %