diff options
| author | Rolf Bjarne Kvinge <RKvinge@novell.com> | 2009-11-05 13:06:30 +0300 |
|---|---|---|
| committer | Rolf Bjarne Kvinge <RKvinge@novell.com> | 2009-11-05 13:06:30 +0300 |
| commit | c82a407358e74293375620d6f279083609063828 (patch) | |
| tree | c04b9b3b7691867d3d73ef2cd877b89bbfa0f49b /tools | |
| parent | c082e3b1088d5d8d78d58394cb238370b3ff840e (diff) | |
In mono/metadata:
2009-11-05 Rolf Bjarne Kvinge <RKvinge@novell.com>
* culture-info-tables.h: regenerated.
In tools/locale-builder:
2009-11-05 Rolf Bjarne Kvinge <RKvinge@novell.com>
* Driver.cs: Generate locale data for neutral cultures too. Moonlight
requires it.
svn path=/trunk/mono/; revision=145467
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/locale-builder/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/locale-builder/Driver.cs | 24 |
2 files changed, 19 insertions, 10 deletions
diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog index 01c51f24ba6..bbe196359bb 100644 --- a/tools/locale-builder/ChangeLog +++ b/tools/locale-builder/ChangeLog @@ -1,3 +1,8 @@ +2009-11-05 Rolf Bjarne Kvinge <RKvinge@novell.com> + + * Driver.cs: Generate locale data for neutral cultures too. Moonlight + requires it. + 2009-05-20 Atsushi Enomoto <atsushi@ximian.com> * README: added (I needed it!) diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs index 52586043f24..a867f82a268 100644 --- a/tools/locale-builder/Driver.cs +++ b/tools/locale-builder/Driver.cs @@ -293,7 +293,7 @@ namespace Mono.Tools.LocaleBuilder { { XPathDocument doc = GetXPathDocument (Path.Combine ("langs", GetShortName (lang) + ".xml")); XPathNavigator nav = doc.CreateNavigator (); - CultureInfoEntry ci = new CultureInfoEntry (); + CultureInfoEntry ci = LookupCulture (GetShortName (lang), true); string lang_type, terr_type; // ci.Name = lang; // TODO: might need to be mapped. @@ -327,10 +327,6 @@ namespace Mono.Tools.LocaleBuilder { ci.NativeName = LookupFullName (ci, nav); } - // Null these out because langs dont have them - ci.DateTimeFormatEntry = null; - ci.NumberFormatEntry = null; - langs [lang] = ci; cultures.Add (ci); @@ -356,13 +352,18 @@ namespace Mono.Tools.LocaleBuilder { private CultureInfoEntry LookupCulture (string locale) { - string path = Path.Combine ("locales", locale + ".xml"); + return LookupCulture (locale, false); + } + private CultureInfoEntry LookupCulture (string locale, bool is_language) + { + string path = Path.Combine (is_language ? "langs" : "locales", locale + ".xml"); if (!File.Exists (path)) return null; XPathDocument doc = GetXPathDocument (path); XPathNavigator nav = doc.CreateNavigator (); CultureInfoEntry ci = new CultureInfoEntry (); string supp; + string loc; // ci.Name = locale; // TODO: Some of these need to be mapped. @@ -370,7 +371,7 @@ namespace Mono.Tools.LocaleBuilder { ci.Language = nav.Evaluate ("string (ldml/identity/language/@type)").ToString (); ci.Territory = nav.Evaluate ("string (ldml/identity/territory/@type)").ToString (); - if (!LookupLcids (ci, false)) + if (!LookupLcids (ci, is_language)) return null; LookupNames (ci); @@ -402,9 +403,12 @@ namespace Mono.Tools.LocaleBuilder { Lookup (nav, ci); } - doc = GetXPathDocument (Path.Combine ("locales", locale + ".xml")); - nav = doc.CreateNavigator (); - Lookup (nav, ci); + loc = Path.Combine ("locales", locale + ".xml"); + if (File.Exists (loc)) { + doc = GetXPathDocument (loc); + nav = doc.CreateNavigator (); + Lookup (nav, ci); + } supp = Path.Combine ("supp", locale + ".xml"); if (File.Exists (supp)) { |