Merge pull request #5714 from alexischr/update_bockbuild

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

diff --git a/tools/locale-builder/RegionInfoEntry.cs b/tools/locale-builder/RegionInfoEntry.cs
index 6418c567db0eeee2b322803b526dfebb64301b76..8cfdde5ecb6321122db43249c34876c9974eaeb9 100644 (file)
--- a/tools/locale-builder/RegionInfoEntry.cs
+++ b/tools/locale-builder/RegionInfoEntry.cs
@@ -16,39 +16,35 @@ namespace Mono.Tools.LocaleBuilder
 {
        public class RegionInfoEntry : Entry
        {
-               public int RegionId; // numbered by alphabetical order of ISO2Name.
-               // public byte MeasurementSystem;
-               // public int GeoId;
-               public string ISO2Name = String.Empty; // supplementalData.xml
-               public string ISO3Name = String.Empty;
-               public string Win3Name = String.Empty;
-               public string EnglishName = String.Empty; // langs/en.xml
-               public string CurrencySymbol = String.Empty;
-               public string ISOCurrencySymbol = String.Empty; // supplementalData.xml
-               public string CurrencyEnglishName = String.Empty; // langs/en.xml
-
-               // NativeName and CurrencyNativeName are language dependent.
+               public int Index; // Used to link region from culture, it must be 0-based index from region_name_entries
+
+               public string GeoId;
+               public string TwoLetterISORegionName;
+               public string ThreeLetterISORegionName;
+               public string ThreeLetterWindowsRegionName;
+               public string EnglishName;
+               public string CurrencySymbol;
+               public string ISOCurrencySymbol;
+               public string CurrencyEnglishName;
+               public string Name;
+               public string DisplayName;
+               public string NativeName;
+               public string CurrencyNativeName;
+               public bool IsMetric = true;
 
                public void AppendTableRow (StringBuilder builder)
                {
-                       builder.Append ("\t{");
-                       builder.Append (RegionId);
-                       builder.Append (',');
-                       // builder.Append (MeasurementSystem);
-                       // builder.Append (',');
-                       builder.Append (EncodeStringIdx (ISO2Name));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (ISO3Name));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (Win3Name));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (EnglishName));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (CurrencySymbol));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (ISOCurrencySymbol));
-                       builder.Append (',');
-                       builder.Append (EncodeStringIdx (CurrencyEnglishName));
+                       builder.Append ("\t{ ");
+                       builder.Append (GeoId).Append (',');
+                       builder.Append (EncodeStringIdx (TwoLetterISORegionName)).Append (',');
+                       builder.Append (EncodeStringIdx (ThreeLetterISORegionName)).Append (',');
+                       builder.Append (EncodeStringIdx (ThreeLetterWindowsRegionName)).Append (',');
+                       builder.Append (EncodeStringIdx (EnglishName)).Append (',');
+                       builder.Append (EncodeStringIdx (NativeName)).Append (',');
+                       builder.Append (EncodeStringIdx (CurrencySymbol)).Append (',');
+                       builder.Append (EncodeStringIdx (ISOCurrencySymbol)).Append (',');
+                       builder.Append (EncodeStringIdx (CurrencyEnglishName)).Append (',');
+                       builder.Append (EncodeStringIdx (CurrencyNativeName));
                        builder.Append ('}');
                }