Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / tools / locale-builder / DateTimeFormatEntry.cs

diff --git a/tools/locale-builder/DateTimeFormatEntry.cs b/tools/locale-builder/DateTimeFormatEntry.cs
index 3780835cbc825d6a095aa1b850fa2843e6d3bd6f..7830c02b95fe88e60a110a591246d2e2db060f47 100644 (file)
--- a/tools/locale-builder/DateTimeFormatEntry.cs
+++ b/tools/locale-builder/DateTimeFormatEntry.cs
@@ -48,35 +48,24 @@ namespace Mono.Tools.LocaleBuilder
                public string[] DayNames = new string[Constants.NUM_DAYS];
                public int? FirstDayOfWeek;
                public string RawFullDateTimePattern;
-               public string LongDatePattern;
-               public string LongTimePattern;
                public string MonthDayPattern;
                public string[] MonthGenitiveNames = new string[Constants.NUM_MONTHS];
                public string[] MonthNames = new string[Constants.NUM_MONTHS];
                public string PMDesignator;
-               public string ShortDatePattern;
-               public string ShortTimePattern;
                public string TimeSeparator;
-               public string YearMonthPattern;
                public string[] ShortDatePatterns = new string[Constants.NUM_SHORT_DATE_PATTERNS];
                public string[] LongDatePatterns = new string[Constants.NUM_LONG_DATE_PATTERNS];
                public string[] ShortTimePatterns = new string[Constants.NUM_SHORT_TIME_PATTERNS];
                public string[] LongTimePatterns = new string[Constants.NUM_LONG_TIME_PATTERNS];
                public string[] ShortestDayNames = new string[Constants.NUM_DAYS];
+               public string[] YearMonthPatterns = new string[Constants.NUM_YEAR_MONTH_PATTERNS];
 
                public int Row;
 
                public void AppendTableRow (StringBuilder builder)
                {
                        builder.Append ("\t{");
-                       builder.Append (EncodeStringIdx (LongDatePattern) + ", ");
-                       builder.Append (EncodeStringIdx (ShortDatePattern) + ", ");
-
-                       builder.Append (EncodeStringIdx (LongTimePattern) + ", ");
-                       builder.Append (EncodeStringIdx (ShortTimePattern) + ", ");
-
-                       builder.Append (EncodeStringIdx (YearMonthPattern) + ", ");
-                       builder.Append (EncodeStringIdx (MonthDayPattern) + ", ");
+                       builder.Append (EncodePatternStringIdx (MonthDayPattern) + ", ");
 
                        builder.Append (EncodeStringIdx (AMDesignator) + ", ");
                        builder.Append (EncodeStringIdx (PMDesignator) + ", ");
@@ -104,6 +93,8 @@ namespace Mono.Tools.LocaleBuilder
                        AppendPatterns (builder, ShortTimePatterns);
                        builder.Append (',');
                        AppendPatterns (builder, LongTimePatterns);
+                       builder.Append (',');
+                       AppendPatterns (builder, YearMonthPatterns);
 
                        builder.Append ('}');
                }
@@ -115,7 +106,7 @@ namespace Mono.Tools.LocaleBuilder
                                if (i > 0)
                                        builder.Append (',');
 
-                               string s = EncodeStringIdx (patterns[i]);
+                               string s = EncodePatternStringIdx (patterns[i]);
                                builder.Append (s);
                        }
                        if (patterns.Count == 0)