2007-11-03 Atsushi Enomoto <atsushi@ximian.com>

	* DateTimeFormatEntry.cs, Driver.cs : adjust the count of
	  MonthNames and AbbreviatedMonthNames entries to 13.
	  Fixed bug #332553.

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

diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog
index 9a5baf19858d664f1f1d762a7102cf10701b3714..2d7813cfadfc2b12e7dd55e65fbd5a9fd86336a4 100644 (file)
--- a/tools/locale-builder/ChangeLog
+++ b/tools/locale-builder/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-03  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DateTimeFormatEntry.cs, Driver.cs : adjust the count of
+         MonthNames and AbbreviatedMonthNames entries to 13.
+         Fixed bug #332553.
+
 2007-10-30  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Driver.cs, DateTimeFormatEntry.cs : since FullDateTimePattern

diff --git a/tools/locale-builder/DateTimeFormatEntry.cs b/tools/locale-builder/DateTimeFormatEntry.cs
index 1e395d284c9eee1d768ba52378666cb71a7dc7c4..0c8fbca34819b5ddf987dd5d7fc67ee004e861a1 100644 (file)
--- a/tools/locale-builder/DateTimeFormatEntry.cs
+++ b/tools/locale-builder/DateTimeFormatEntry.cs
@@ -69,7 +69,6 @@ namespace Mono.Tools.LocaleBuilder {
 
                         AppendNames (builder, MonthNames);
                         builder.Append (", ");
-                        AbbreviatedMonthNames.Add (String.Empty); /* ALLWAYS ?? */
                         AppendNames (builder, AbbreviatedMonthNames);
                         builder.Append (", ");
 

diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index e862393539da6d63be3397226def95a15a2b1e0a..52586043f241713ffeb53948ee225b67cc290485 100644 (file)
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -523,6 +523,8 @@ namespace Mono.Tools.LocaleBuilder {
                                                df.MonthNames.Clear ();
                                        df.MonthNames.Add (ni2.Current.Value);
                                }
+                               if (df.MonthNames.Count == 12)
+                                       df.MonthNames.Add (String.Empty);
 
                                ni2 = (XPathNodeIterator) ni.Current.Evaluate ("dayNames/day");
                                while (ni2.MoveNext ()) {
@@ -544,6 +546,8 @@ namespace Mono.Tools.LocaleBuilder {
                                                df.AbbreviatedMonthNames.Clear ();
                                        df.AbbreviatedMonthNames.Add (ni2.Current.Value);
                                }
+                               if (df.AbbreviatedMonthNames.Count == 12)
+                                       df.AbbreviatedMonthNames.Add (String.Empty);
 
                                ni2 = (XPathNodeIterator) ni.Current.Evaluate ("dateFormats/dateFormatLength");
                                while (ni2.MoveNext ()) {