diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2007-10-30 13:10:56 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2007-10-30 13:10:56 +0300 |
| commit | b30218afa2a50daedf0bbfa38bd292607e5948e6 (patch) | |
| tree | 2cce2b45c2f411fc51486e2be049fd2c963ea3e8 /tools | |
| parent | 71a2cbda34a8f2e2de313f712fcdddf4fc3ebab1 (diff) | |
2007-10-30 Atsushi Enomoto <atsushi@ximian.com>
* Driver.cs, DateTimeFormatEntry.cs : since FullDateTimePattern
should be computed on the overriden Long[Date/Time]Pattern, compute
it later than reading all format resources (langs/locales/supp).
* es_ES.xml : couple of format string fixes for bug #335298.
svn path=/trunk/mono/; revision=88442
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/locale-builder/ChangeLog | 6 | ||||
| -rw-r--r-- | tools/locale-builder/DateTimeFormatEntry.cs | 6 | ||||
| -rw-r--r-- | tools/locale-builder/Driver.cs | 4 | ||||
| -rw-r--r-- | tools/locale-builder/supp/ChangeLog | 4 | ||||
| -rwxr-xr-x | tools/locale-builder/supp/es_ES.xml | 27 |
5 files changed, 43 insertions, 4 deletions
diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog index b166d1be3ef..9a5baf19858 100644 --- a/tools/locale-builder/ChangeLog +++ b/tools/locale-builder/ChangeLog @@ -1,3 +1,9 @@ +2007-10-30 Atsushi Enomoto <atsushi@ximian.com> + + * Driver.cs, DateTimeFormatEntry.cs : since FullDateTimePattern + should be computed on the overriden Long[Date/Time]Pattern, compute + it later than reading all format resources (langs/locales/supp). + 2007-08-21 Atsushi Enomoto <atsushi@ximian.com> * Driver.cs : for Euskara culture (eu_ES) do not trim dd which is diff --git a/tools/locale-builder/DateTimeFormatEntry.cs b/tools/locale-builder/DateTimeFormatEntry.cs index 03a7101b3aa..1e395d284c9 100644 --- a/tools/locale-builder/DateTimeFormatEntry.cs +++ b/tools/locale-builder/DateTimeFormatEntry.cs @@ -24,7 +24,7 @@ namespace Mono.Tools.LocaleBuilder { public string DateSeparator; public ArrayList DayNames = new ArrayList (); public int FirstDayOfWeek; - public string FullDateTimePattern; + public string RawFullDateTimePattern; public string LongDatePattern; public string LongTimePattern; public string MonthDayPattern; @@ -40,6 +40,10 @@ namespace Mono.Tools.LocaleBuilder { public ArrayList ShortTimePatterns = new ArrayList (5); public ArrayList LongTimePatterns = new ArrayList (6); + public string FullDateTimePattern { + get { return String.Format (RawFullDateTimePattern, LongTimePattern, LongDatePattern); } + } + public int Row; public void AppendTableRow (StringBuilder builder) diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs index bcdf6c861a5..e862393539d 100644 --- a/tools/locale-builder/Driver.cs +++ b/tools/locale-builder/Driver.cs @@ -639,8 +639,8 @@ namespace Mono.Tools.LocaleBuilder { ni2 = (XPathNodeIterator) ni.Current.Evaluate ("dateTimeFormats/dateTimeFormatLength/dateTimeFormat/pattern"); if (ni2.MoveNext ()) - df.FullDateTimePattern = String.Format (ni2.Current.ToString (), - df.LongTimePattern, df.LongDatePattern); + df.RawFullDateTimePattern = ni2.Current.ToString ();/*String.Format (ni2.Current.ToString (), + df.LongTimePattern, df.LongDatePattern);*/ XPathNodeIterator am = ni.Current.SelectChildren ("am", ""); if (am.MoveNext ()) diff --git a/tools/locale-builder/supp/ChangeLog b/tools/locale-builder/supp/ChangeLog index b56c4bf5bde..fa508842951 100644 --- a/tools/locale-builder/supp/ChangeLog +++ b/tools/locale-builder/supp/ChangeLog @@ -1,3 +1,7 @@ +2007-10-30 Atsushi Enomoto <atsushi@ximian.com> + + * es_ES.xml : couple of format string fixes for bug #335298. + 2007-05-31 Rolf Bjarne Kvinge <RKvinge@novell.com> * en-US.xml: Add a few date/time patterns. diff --git a/tools/locale-builder/supp/es_ES.xml b/tools/locale-builder/supp/es_ES.xml index 7f80edb874c..6ca89a7e437 100755 --- a/tools/locale-builder/supp/es_ES.xml +++ b/tools/locale-builder/supp/es_ES.xml @@ -8,9 +8,34 @@ <dateFormat > <pattern>dd/MM/yyyy</pattern> </dateFormat> - </dateFormatLength > + </dateFormatLength> + <dateFormatLength type="long"> + <dateFormat> + <pattern>dddd, dd' de 'MMMM' de 'yyyy</pattern> + </dateFormat> + </dateFormatLength> + <dateFormatLength type="full"> + <dateFormat> + <pattern>dddd, dd' de 'MMMM' de 'yyyy</pattern> + </dateFormat> + </dateFormatLength> + <dateFormatLength type="year_month"> + <dateFormat> + <pattern>MMMM' de 'yyyy</pattern> + </dateFormat> + </dateFormatLength> + <dateFormatLength type="month_day"> + <dateFormat> + <pattern>dd MMMM</pattern> + </dateFormat> + </dateFormatLength> </dateFormats> <timeFormats> + <timeFormatLength type="full"> + <timeFormat > + <pattern>H:mm:ss</pattern> + </timeFormat> + </timeFormatLength > <timeFormatLength type="long"> <timeFormat > <pattern>H:mm:ss</pattern> |