2007-10-30 Atsushi Enomoto <[email protected]>

	* Driver.cs, DateTimeFormatEntry.cs : since FullDateTimePattern
	  should be computed on the overriden Long[Date/Time]Pattern, compute
	  it later than reading all format resources (langs/locales/supp).

	* es_ES.xml : couple of format string fixes for bug #335298.


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

tools/locale-builder/ChangeLog

@@ -1,3 +1,9 @@
+2007-10-30  Atsushi Enomoto  <[email protected]>
+
+	* Driver.cs, DateTimeFormatEntry.cs : since FullDateTimePattern
+	  should be computed on the overriden Long[Date/Time]Pattern, compute
+	  it later than reading all format resources (langs/locales/supp).
+
 2007-08-21  Atsushi Enomoto  <[email protected]>
 
 	* Driver.cs : for Euskara culture (eu_ES) do not trim dd which is

tools/locale-builder/DateTimeFormatEntry.cs

@@ -24,7 +24,7 @@ namespace Mono.Tools.LocaleBuilder {
                 public string DateSeparator;
                 public ArrayList DayNames = new ArrayList ();
                 public int FirstDayOfWeek;
-                public string FullDateTimePattern;
+                public string RawFullDateTimePattern;
                 public string LongDatePattern;
                 public string LongTimePattern;
                 public string MonthDayPattern;
@@ -40,6 +40,10 @@ namespace Mono.Tools.LocaleBuilder {
                 public ArrayList ShortTimePatterns = new ArrayList (5);
                 public ArrayList LongTimePatterns = new ArrayList (6);
 
+                public string FullDateTimePattern {
+                        get { return String.Format (RawFullDateTimePattern, LongTimePattern, LongDatePattern); }
+                }
+
                 public int Row;
 
                 public void AppendTableRow (StringBuilder builder)

tools/locale-builder/Driver.cs

@@ -639,8 +639,8 @@ namespace Mono.Tools.LocaleBuilder {
 
 				ni2 = (XPathNodeIterator) ni.Current.Evaluate ("dateTimeFormats/dateTimeFormatLength/dateTimeFormat/pattern");
 				if (ni2.MoveNext ())
-					df.FullDateTimePattern = String.Format (ni2.Current.ToString (),
-							df.LongTimePattern, df.LongDatePattern);
+					df.RawFullDateTimePattern = ni2.Current.ToString ();/*String.Format (ni2.Current.ToString (),
+							df.LongTimePattern, df.LongDatePattern);*/
 
 				XPathNodeIterator am = ni.Current.SelectChildren ("am", "");
 				if (am.MoveNext ())

tools/locale-builder/supp/ChangeLog

@@ -1,3 +1,7 @@
+2007-10-30  Atsushi Enomoto  <[email protected]>
+
+	* es_ES.xml : couple of format string fixes for bug #335298.
+
 2007-05-31  Rolf Bjarne Kvinge  <[email protected]>
 
 	* en-US.xml: Add a few date/time patterns.

tools/locale-builder/supp/es_ES.xml

@@ -8,9 +8,34 @@
 						<dateFormat >
 							<pattern>dd/MM/yyyy</pattern>
 						</dateFormat>
-					</dateFormatLength >
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>dddd, dd' de 'MMMM' de 'yyyy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>dddd, dd' de 'MMMM' de 'yyyy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="year_month">
+						<dateFormat>
+							<pattern>MMMM' de 'yyyy</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="month_day">
+						<dateFormat>
+							<pattern>dd MMMM</pattern>
+						</dateFormat>
+					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat >
+							<pattern>H:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength >
 					<timeFormatLength type="long">
 						<timeFormat >
 							<pattern>H:mm:ss</pattern>