2005-02-21 Mark Wielaard <mark@klomp.org>
* gnu/java/locale/LocaleInformation_en.java: Extend
localPatternChars to "GyMdkHmsSEDFwWahKzYeugAZ".
2005-02-21 Mark Wielaard <mark@klomp.org>
* java/text/SimpleDateFormat.java
(SimpleDateFormat(String, DateFormatSymbols)): Throw
NullPointerException when formatData is null.
2005-02-21 Mark Wielaard <mark@klomp.org>
* java/util/SimpleTimeZone.java (getOffset): Calculate beforeEnd by
taking dstSavings into account.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/text/SimpleDateFormat.java,
(parse): Set correct DST_OFFSET to the correct value.
2005-02-21 Mark Wielaard <mark@klomp.org>
* java/util/SimpleTimeZone.java (checkRule): Throw
IllegalArgumentException when month out of range.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/GregorianCalendar.java,
(add): Don't set fields directly anymore. Use set()
2005-02-21 Mark Wielaard <mark@klomp.org>
* java/text/SimpleDateFormat.java (CompiledField.toString):
Use StringBuffer, not StringBuilder.
(toString): Likewise.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java
(clear): Dates should clear to local time.
* java/util/GregorianCalendar.java
(computeTime): Fix priority problem with DAY_OF_WEEK,
Handle non-sunday-startig weeks and minimumDaysInFirstWeek.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java
(Calendar): Constructor should clear fields.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/text/SimpleDateFormat.java
(parse): Tweak handling of 2-year dates
* java/util/Calendar.java
(clear): Clear fields to correct value.
* java/util/GregorianCalendar.java
(computeTime): Correct handling of time zones.
Correct field minimum values.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java
(set) Invalidate all fields on first call to set().
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/GregorianCalendar.java
(computeTime): Fixed handling of time zones.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java
(clear): Set values to Epoch instead of zero.
(set): Set isSet to the relevant field pattern instead of just
the field.
* java/util/GregorianCalendar.java
(getBundle): Removed.
(getDayOfYear): Removed.
(getFirstDayOfMonth): New private method.
(nonLeniencyCheck): New private method.
(computeTime): Correct handling of insufficient data.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java: Invalidate ERA field on setting
the YEAR.
* java/util/SimpleTimeZone.java:
(getDaysInMonth): Reimplemented.
* java/util/GregorianCalendar.java:
(getLinearTime): Removed.
(isLeapYear(int,boolean)): Removed.
(before(), after()): Removed.
(computeTime): Reimplemented.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/Calendar.java: Reformatted.
* java/util/GregorianCalendar.java: Reformatted.
* java/util/SimpleTimeZone.java: Reformatted.
2005-02-21 Sven de Marothy <sven@physto.se>
* java/util/GregorianCalendar.java
(GregorianCalendar): Update fields in the constructor
2005-02-21 Noa Resare <noa@resare.com>
* java/util/Calendar.java (explicitDSTOffset): New instance field.
(set(int,int)): Set and use new field.
(set(int,int,int)): Check new field.
2005-02-21 Noa Resare <address@hidden>
* java/util/Calendar.java(set):
Fix for DST related regression.
2005-02-21 Jeroen Frijters <jeroen@frijters.net>
* java/util/Calendar.java
(setTimeInMillis): Added call to clear, removed computeFields call.
* java/util/Date.java
(Date(int,int,int,int,int,int)): Removed workaround for
GregorianCalendar bug.
* java/util/GregorianCalendar.java
(GregorianCalendar): Chained all constructors to a (new)
common constructor.
(computeTime): Fixed support for lenient month treatment.
(getLinearDay): Return long instead of int.
(calculateDay): Added fields argument and changed day argument
to long.
2005-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/text/SimpleDateFormat.java
Lots of documentation updates.
(readObject(java.io.ObjectInputStream)): Wraps
IllegalArgumentException as specified.
(compileFormat(String)): Uses standardChars
rather than the local pattern characters.
Throws IllegalArgumentException rather than
storing a -1 field.
(toString()): Extended to include all variables
in a better format.
(translateLocalizedPattern(String, String, String)):
Renamed to better define the use of this method.
2005-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/text/DateFormat.java:
Documented pattern character offset constants and
added new ones.
(Field): Added new static fields for new pattern chars.
* java/text/SimpleDateFormat.java:
(CompiledField): Changed name of FieldSizePair class
to CompiledField after adding the character as an
attribute. Changed fields to private and added
accessors to give encapsulation.
(CompiledField.CompiledField(int,int,char)): Extended
with character field.
(CompiledField.getField()): New accessor method.
(CompiledField.getSize()): New acceessor method.
(CompiledField.getCharacter()): New accessor method.
(CompiledField.toString()): Added primarily for debugging.
(standardChars): Now uses extended 24 character sequence.
(compileFormat(String)): Changed to use CompiledField.
(formatWithAttribute(java.util.Date, gnu.java.text.FormatBuffer,
java.text.FieldPosition)): Changed to use CompiledField.
New handler for RFC 822 timezones added.
2005-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/text/SimpleDateFormat.java:
(parse(String, java.text.ParsePosition)):
Changed 'E' and 'M' cases to use both
short and long names. Extended 'z'
case to also handle 'Z', and deal
with simple GMT offsets such as +0100.
(computeOffset(String)): New private method,
which converts a GMT offset specification,
such as GMT-0500 to a numeric offset in
milliseconds.
* java/util/TimeZone.java:
(timezones()): Added "CEST", the daylight
savings time version of "CET", or Central
European Time.
2005-02-21 Ito Kazumitsu <kaz@maczuka.gcd.org>
* java/text/SimpleDateFormat.java:
(parse): Set the DST offset to 0 when parsing
GMT offset timezones.
2005-02-21 Ito Kazumitsu <kaz@maczuka.gcd.org>
* java/text/SimpleDateFormat.java:
(parse): Use offset to set ZONE_OFFSET
rather than the DST_OFFSET, so that
GMT offset timezones change the right
one.
2005-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/text/SimpleDateFormat.java:
(getDateFormatSymbols()): return a copy
(setDateFormatSymbols(java.text.DateFormatSymbols)):
throw exception on null input
(clone()): implemented to clone
internal fields
2005-02-21 Sven de Marothy <sven@physto.se>
* java/text/SimpleDateFormat.java
(parse): comparison should be case-insensitive, ignore null
strings.
From-SVN: r95368
208 lines
6.8 KiB
Java
208 lines
6.8 KiB
Java
/* LocaleInformation_en.java -- US English locale data
|
|
Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.locale;
|
|
|
|
import java.util.ListResourceBundle;
|
|
|
|
/**
|
|
* This class contains locale data for English.
|
|
*/
|
|
public class LocaleInformation_en extends ListResourceBundle
|
|
{
|
|
|
|
/*
|
|
* This area is used for defining object values
|
|
*/
|
|
|
|
/**
|
|
* This is the set of collation rules used by java.text.RuleBasedCollator
|
|
* to sort strings properly. See the documentation of that class for the
|
|
* proper format.
|
|
*/
|
|
// FIXME: this is nowhere near complete.
|
|
// In particular we must mark accents as ignorable,
|
|
// and probably other things as well.
|
|
private static final String collation_rules =
|
|
"<0<1<2<3<4<5<6<7<8<9<A,a<b,B<c,C<d,D<e,E<f,F<g,G<h,H<i,I<j,J<k,K" +
|
|
"<l,L<m,M<n,N<o,O<p,P<q,Q<r,R<s,S<t,T<u,U<v,V<w,W<x,X<y,Y<z,Z";
|
|
|
|
/**
|
|
* This is the list of months, fully spelled out
|
|
*/
|
|
private static final String[] months =
|
|
{
|
|
"January", "February", "March", "April", "May", "June",
|
|
"July", "August", "September", "October", "November", "December", null
|
|
};
|
|
|
|
/**
|
|
* This is the list of abbreviated month names
|
|
*/
|
|
private static final String[] shortMonths =
|
|
{
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", null
|
|
};
|
|
|
|
/**
|
|
* This is the list of weekdays, fully spelled out
|
|
*/
|
|
private static final String[] weekdays =
|
|
{
|
|
null, "Sunday", "Monday", "Tuesday", "Wednesday",
|
|
"Thursday", "Friday", "Saturday"
|
|
};
|
|
|
|
/**
|
|
* This is the list of abbreviated weekdays
|
|
*/
|
|
private static final String[] shortWeekdays =
|
|
{
|
|
null, "Sun", "Mon", "Tue", "Wed",
|
|
"Thu", "Fri", "Sat"
|
|
};
|
|
|
|
/**
|
|
* This is the list of AM/PM strings
|
|
*/
|
|
private static final String[] ampms = { "AM", "PM" };
|
|
|
|
/**
|
|
* This is the list of era identifiers
|
|
*/
|
|
private static final String[] eras = { "BC", "AD" };
|
|
|
|
private static final String[][] zoneStrings =
|
|
{
|
|
{ "GMT", "Greenwich Mean Time", "GMT",
|
|
/**/ "Greenwich Mean Time", "GMT", "GMT" },
|
|
{ "PST", "Pacific Standard Time", "PST",
|
|
/**/ "Pacific Daylight Time", "PDT", "San Francisco" },
|
|
{ "MST", "Mountain Standard Time", "MST",
|
|
/**/ "Mountain Daylight Time", "MDT", "Denver" },
|
|
{ "PNT", "Mountain Standard Time", "MST",
|
|
/**/ "Mountain Standard Time", "MST", "Phoenix" },
|
|
{ "CST", "Central Standard Time", "CST",
|
|
/**/ "Central Daylight Time", "CDT", "Chicago" },
|
|
{ "EST", "Eastern Standard Time", "EST",
|
|
/**/ "Eastern Daylight Time", "EDT", "Boston" },
|
|
{ "IET", "Eastern Standard Time", "EST",
|
|
/**/ "Eastern Standard Time", "EST", "Indianapolis" },
|
|
{ "PRT", "Atlantic Standard Time", "AST",
|
|
/**/ "Atlantic Daylight Time", "ADT", "Halifax" },
|
|
{ "CNT", "Newfoundland Standard Time", "NST",
|
|
/**/ "Newfoundland Daylight Time", "NDT", "St. Johns" },
|
|
{ "ECT", "Central European Standard Time", "CET",
|
|
/**/ "Central European Daylight Time", "CEST", "Paris" },
|
|
{ "CTT", "China Standard Time", "CST",
|
|
/**/ "China Standard Time", "CST", "Shanghai" },
|
|
{ "JST", "Japan Standard Time", "JST",
|
|
/**/ "Japan Standard Time", "JST", "Tokyo" },
|
|
{ "HST", "Hawaii Standard Time", "HST",
|
|
/**/ "Hawaii Standard Time", "HST", "Honolulu" },
|
|
{ "AST", "Alaska Standard Time", "AKST",
|
|
/**/ "Alaska Daylight Time", "AKDT", "Anchorage" }
|
|
};
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* This is the object array used to hold the keys and values
|
|
* for this bundle
|
|
*/
|
|
|
|
private static final Object[][] contents =
|
|
{
|
|
// For RuleBasedCollator
|
|
{ "collation_rules", collation_rules },
|
|
|
|
// For SimpleDateFormat/DateFormatSymbols
|
|
{ "months", months },
|
|
{ "shortMonths", shortMonths },
|
|
{ "weekdays", weekdays },
|
|
{ "shortWeekdays", shortWeekdays },
|
|
{ "ampms", ampms },
|
|
{ "eras", eras },
|
|
{ "localPatternChars", "GyMdkHmsSEDFwWahKzYeugAZ" },
|
|
{ "zoneStrings", zoneStrings },
|
|
|
|
{ "shortDateFormat", "M/d/yy" }, // Java's Y2K bug.
|
|
{ "mediumDateFormat", "d-MMM-yy" },
|
|
{ "longDateFormat", "MMMM d, yyyy" },
|
|
{ "fullDateFormat", "EEEE MMMM d, yyyy G" },
|
|
{ "defaultDateFormat", "d-MMMM-yy" },
|
|
{ "shortTimeFormat", "h:mm a" },
|
|
{ "mediumTimeFormat", "h:mm:ss a" },
|
|
{ "longTimeFormat", "h:mm:ss a z" },
|
|
{ "fullTimeFormat", "h:mm:ss;S 'o''clock' a z" },
|
|
{ "defaultTimeFormat", "h:mm:ss a" },
|
|
|
|
// For DecimalFormat/DecimalFormatSymbols
|
|
{ "decimalSeparator", "." },
|
|
{ "digit", "#" },
|
|
{ "exponential", "E" },
|
|
{ "groupingSeparator", "," },
|
|
{ "infinity", "\u221e" },
|
|
{ "NaN", "\ufffd" },
|
|
{ "minusSign", "-" },
|
|
{ "monetarySeparator", "." },
|
|
{ "patternSeparator", ";" },
|
|
{ "percent", "%" },
|
|
{ "perMill", "\u2030" },
|
|
{ "zeroDigit", "0" },
|
|
|
|
// For NumberFormat.
|
|
{ "numberFormat", "#,##0.###" },
|
|
{ "percentFormat", "#,##0%" },
|
|
};
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* This method returns the object array of key, value pairs containing
|
|
* the data for this bundle.
|
|
*
|
|
* @return The key, value information.
|
|
*/
|
|
public Object[][] getContents ()
|
|
{
|
|
return contents;
|
|
}
|
|
}
|