2005-08-17 Atsushi Enomoto <atsushi@ximian.com>

	* Driver.cs : add primary date/time pattern strings as the first
	  entry of for each "whole specific patterns".
	  (e.g. LongDatePatterns[0] should be LongDatePattern.)

	* fr.xml : fixed long date pattern and dateTimeFormats.
	* ja.xml : fixed long time pattern and dateTimeFormats.


svn path=/trunk/mono/; revision=48451

5 files changed, 52 insertions, 5 deletions

diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog
index 9069d6fc4e9..d5d4b8bb1a3 100644
--- a/tools/locale-builder/ChangeLog
+++ b/tools/locale-builder/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-17  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* Driver.cs : add primary date/time pattern strings as the first
+	  entry of for each "whole specific patterns".
+	  (e.g. LongDatePatterns[0] should be LongDatePattern.)
+
+2005-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* CultureInfoEntry.cs : added RegionId.
 	* Driver.cs : modified to not write RegionLCIDMap and use
 	  CultureInfoEntry for that lookup purpose instead.
diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index 6e32d842c8e..a38915b7912 100644
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -534,11 +534,13 @@ namespace Mono.Tools.LocaleBuilder {
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.LongDatePatterns.Clear ();
+							AddPattern (df.LongDatePatterns, df.LongDatePattern);
 							do {
 								df.LongDatePatterns.Add (ext.Current.Value);
 							} while (ext.MoveNext ());
 						}
-						AddPattern (df.LongDatePatterns, df.LongDatePattern);
+						else
+							AddPattern (df.LongDatePatterns, df.LongDatePattern);
 						break;
 					case "short":
 						if (value != null)
@@ -546,11 +548,13 @@ namespace Mono.Tools.LocaleBuilder {
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.ShortDatePatterns.Clear ();
+							AddPattern (df.ShortDatePatterns, df.ShortDatePattern);
 							do {
 								df.ShortDatePatterns.Add (ext.Current.Value);
 							} while (ext.MoveNext ());
 						}
-						AddPattern (df.ShortDatePatterns, df.ShortDatePattern);
+						else
+							AddPattern (df.ShortDatePatterns, df.ShortDatePattern);
 						break;
 					case "year_month":
 						if (value != null)
@@ -578,11 +582,13 @@ namespace Mono.Tools.LocaleBuilder {
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.LongTimePatterns.Clear ();
+							AddPattern (df.LongTimePatterns, df.LongTimePattern);
 							do {
 								df.LongTimePatterns.Add (ext.Current.Value);
 							} while (ext.MoveNext ());
 						}
-						AddPattern (df.LongTimePatterns, df.LongTimePattern);
+						else
+							AddPattern (df.LongTimePatterns, df.LongTimePattern);
 						break;
 					case "short":
 						if (value != null)
@@ -590,11 +596,13 @@ namespace Mono.Tools.LocaleBuilder {
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.ShortTimePatterns.Clear ();
+							AddPattern (df.ShortTimePatterns, df.ShortTimePattern);
 							do {
 								df.ShortTimePatterns.Add (ext.Current.Value);
 							} while (ext.MoveNext ());
 						}
-						AddPattern (df.ShortTimePatterns, df.ShortTimePattern);
+						else
+							AddPattern (df.ShortTimePatterns, df.ShortTimePattern);
 						break;
 					}
 				}
diff --git a/tools/locale-builder/supp/ChangeLog b/tools/locale-builder/supp/ChangeLog
index a8851d5c6d1..380ade3fbac 100755
--- a/tools/locale-builder/supp/ChangeLog
+++ b/tools/locale-builder/supp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* fr.xml : fixed long date pattern and dateTimeFormats.
+	* ja.xml : fixed long time pattern and dateTimeFormats.
+
 2005-05-25  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* fr.xml : more date pattern.
diff --git a/tools/locale-builder/supp/fr.xml b/tools/locale-builder/supp/fr.xml
index 4460c06d702..6dc13a604bb 100644
--- a/tools/locale-builder/supp/fr.xml
+++ b/tools/locale-builder/supp/fr.xml
@@ -4,6 +4,11 @@
 		<calendars>
 			<calendar type="gregorian">
 				<dateFormats>
+					<dateFormatLength type="long">
+						<dateFormat >
+							<pattern>dddd d MMMM yyyy</pattern>
+						</dateFormat>
+					</dateFormatLength >
 					<dateFormatLength type="short">
 						<extraPatterns>
 							<pattern>d/MM/yyyy</pattern>
@@ -11,6 +16,20 @@
 						</extraPatterns>
 					</dateFormatLength >
 				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="long">
+						<timeFormat >
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength >
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength >
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength >
+				</dateTimeFormats>
 			</calendar>
 		</calendars>
 	</dates>
diff --git a/tools/locale-builder/supp/ja.xml b/tools/locale-builder/supp/ja.xml
index 2fda6ce803b..893830b485f 100755
--- a/tools/locale-builder/supp/ja.xml
+++ b/tools/locale-builder/supp/ja.xml
@@ -50,8 +50,10 @@
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="long">
-						<extraPatterns>
+						<timeFormat>
 							<pattern>H:mm:ss</pattern>
+						</timeFormat>
+						<extraPatterns>
 							<pattern>HH:mm:ss</pattern>
 							<pattern>tt h:mm:ss</pattern>
 							<pattern>tt hh:mm:ss</pattern>
@@ -66,6 +68,13 @@
 						</extraPatterns>
 					</timeFormatLength>
 				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength >
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength >
+				</dateTimeFormats>
 			</calendar>
 		</calendars>
 	</dates>