X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tools%2Flocale-builder%2FRegionInfoEntry.cs;h=8cfdde5ecb6321122db43249c34876c9974eaeb9;hb=ddecee5dd00964e067631f9df9c8c5a20a4f10a4;hp=b0fd61014129405c85c808bba6bdd50168f6965a;hpb=9bd445ade65cbcfa37112ae815fe8dffd632bf68;p=mono.git

diff --git a/tools/locale-builder/RegionInfoEntry.cs b/tools/locale-builder/RegionInfoEntry.cs
index b0fd6101412..8cfdde5ecb6 100644
--- a/tools/locale-builder/RegionInfoEntry.cs
+++ b/tools/locale-builder/RegionInfoEntry.cs
@@ -16,38 +16,35 @@ namespace Mono.Tools.LocaleBuilder
 {
 	public class RegionInfoEntry : Entry
 	{
-		public int RegionId; // it is GeoId in 2.0.
-		// public byte MeasurementSystem;
-		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{ 0, "); // 0 is a slot for LCID (stored at managed code)
-			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 ('}');
 		}