diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2007-05-15 18:08:25 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2007-05-15 18:08:25 +0400 |
| commit | 9bd445ade65cbcfa37112ae815fe8dffd632bf68 (patch) | |
| tree | 5e94e59c503b402654b36dff58a48263d64fb46b /tools | |
| parent | d9c00916926080f70d6e3896a08c1c2c39a4aa44 (diff) | |
2007-05-15 Atsushi Enomoto <atsushi@ximian.com>
in metadata:
* object-internals.h
culture-info.h : added territory field in MonoCulture and
CultureInfoEntry foreach. Added lcid field in RegionInfoEntry.
* locales.c : fill territory field above too.
* culture-info-table.h : regenerated.
in locale-builder:
* CultureInfoEntry.cs : output Territory, which is used for RegionInfo.
* RegionInfoEntry.cs : added dummy int which is a slot for LCID.
svn path=/trunk/mono/; revision=77407
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/locale-builder/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/locale-builder/CultureInfoEntry.cs | 7 | ||||
| -rw-r--r-- | tools/locale-builder/RegionInfoEntry.cs | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog index 0bcbaf021e5..ac2f7cf1907 100644 --- a/tools/locale-builder/ChangeLog +++ b/tools/locale-builder/ChangeLog @@ -1,3 +1,8 @@ +2007-05-15 Atsushi Enomoto <atsushi@ximian.com> + + * CultureInfoEntry.cs : output Territory, which is used for RegionInfo. + * RegionInfoEntry.cs : added dummy int which is a slot for LCID. + 2007-04-25 Atsushi Enomoto <atsushi@ximian.com> * Driver.cs : use invariant culture to sort culture names. diff --git a/tools/locale-builder/CultureInfoEntry.cs b/tools/locale-builder/CultureInfoEntry.cs index fe621b0e5cb..fb9f642e242 100644 --- a/tools/locale-builder/CultureInfoEntry.cs +++ b/tools/locale-builder/CultureInfoEntry.cs @@ -80,13 +80,14 @@ namespace Mono.Tools.LocaleBuilder { builder.AppendFormat ("{0}, {1}, {2}, {3}," + "{4}, {5}, {6}, " + "{7}, {8}, {9}, " + - "{10}, {11}, " + - "{12}, " + - "{13}, {14}, {15}", + "{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 (Territory), ValuesString (CalendarData), DateTimeFormatEntry == null ? -1 : DateTimeFormatEntry.Row, NumberFormatEntry == null ? -1 : NumberFormatEntry.Row, diff --git a/tools/locale-builder/RegionInfoEntry.cs b/tools/locale-builder/RegionInfoEntry.cs index 6418c567db0..b0fd6101412 100644 --- a/tools/locale-builder/RegionInfoEntry.cs +++ b/tools/locale-builder/RegionInfoEntry.cs @@ -16,9 +16,8 @@ namespace Mono.Tools.LocaleBuilder { public class RegionInfoEntry : Entry { - public int RegionId; // numbered by alphabetical order of ISO2Name. + public int RegionId; // it is GeoId in 2.0. // public byte MeasurementSystem; - // public int GeoId; public string ISO2Name = String.Empty; // supplementalData.xml public string ISO3Name = String.Empty; public string Win3Name = String.Empty; @@ -31,7 +30,7 @@ namespace Mono.Tools.LocaleBuilder public void AppendTableRow (StringBuilder builder) { - builder.Append ("\t{"); + builder.Append ("\t{ 0, "); // 0 is a slot for LCID (stored at managed code) builder.Append (RegionId); builder.Append (','); // builder.Append (MeasurementSystem); |