[mscorlib/getfolderpath] Special-case MacOS X.

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

diff --git a/tools/locale-builder/CultureInfoEntry.cs b/tools/locale-builder/CultureInfoEntry.cs
index dc29a5e1f68a5676eb4f760b45a6886c70cc6a62..fb9f642e2420449bbb9f702b218fbecfc3a41649 100644 (file)
--- a/tools/locale-builder/CultureInfoEntry.cs
+++ b/tools/locale-builder/CultureInfoEntry.cs
@@ -15,6 +15,11 @@ namespace Mono.Tools.LocaleBuilder {
 
         public class CultureInfoEntry : Entry {
 
 
         public class CultureInfoEntry : Entry {
 

+               public static CultureInfoEntry ShallowCopy (CultureInfoEntry e)
+               {
+                       return (CultureInfoEntry) e.MemberwiseClone ();
+               }
+

                 string language;
 
                 public string Territory;
                 string language;
 
                 public string Territory;


@@ -28,6 +33,7 @@ namespace Mono.Tools.LocaleBuilder {
                 public string Lcid;
                 public string ParentLcid;
                 public string SpecificLcid;
                 public string Lcid;
                 public string ParentLcid;
                 public string SpecificLcid;

+                public int RegionId = -1;

                 public DateTimeFormatEntry DateTimeFormatEntry;
                 public NumberFormatEntry NumberFormatEntry;
                 public TextInfoEntry TextInfoEntry;
                 public DateTimeFormatEntry DateTimeFormatEntry;
                 public NumberFormatEntry NumberFormatEntry;
                 public TextInfoEntry TextInfoEntry;


@@ -71,16 +77,17 @@ namespace Mono.Tools.LocaleBuilder {
                 public void AppendTableRow (StringBuilder builder)
                 {
                         builder.Append ("\t{");
                 public void AppendTableRow (StringBuilder builder)
                 {
                         builder.Append ("\t{");

-                        builder.AppendFormat ("{0}, {1}, {2}, " +
-                                        "{3}, {4}, {5}, " +
-                                        "{6}, {7}, {8}, " +
-                                        "{9}, {10}, " +
-                                        "{11}, " +
-                                        "{12}, {13}, {14}",
-                                        Lcid, ParentLcid, SpecificLcid,
+                        builder.AppendFormat ("{0}, {1}, {2}, {3}," +
+                                        "{4}, {5}, {6}, " +
+                                        "{7}, {8}, {9}, " +
+                                        "{10}, {11}, {12}, " +
+                                        "{13}, " +
+                                        "{14}, {15}, {16}",
+                                        Lcid, ParentLcid, SpecificLcid, RegionId,

                                         EncodeStringIdx (Name), EncodeStringIdx (IcuName), EncodeStringIdx (EnglishName),
                                         EncodeStringIdx (DisplayName), EncodeStringIdx (NativeName), EncodeStringIdx (Win3Lang),
                                         EncodeStringIdx (ISO3Lang), EncodeStringIdx (ISO2Lang),
                                         EncodeStringIdx (Name), EncodeStringIdx (IcuName), EncodeStringIdx (EnglishName),
                                         EncodeStringIdx (DisplayName), EncodeStringIdx (NativeName), EncodeStringIdx (Win3Lang),
                                         EncodeStringIdx (ISO3Lang), EncodeStringIdx (ISO2Lang),

+                                        EncodeStringIdx (Territory),

                                         ValuesString (CalendarData),
                                         DateTimeFormatEntry == null ? -1 : DateTimeFormatEntry.Row,
                                         NumberFormatEntry == null ? -1 : NumberFormatEntry.Row,
                                         ValuesString (CalendarData),
                                         DateTimeFormatEntry == null ? -1 : DateTimeFormatEntry.Row,
                                         NumberFormatEntry == null ? -1 : NumberFormatEntry.Row,