diff options
| author | Warren Levy <warrenl@cygnus.com> | 2000-11-28 03:09:22 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 2000-11-28 03:09:22 +0000 |
| commit | a22add726841748f6c4051f8d9b4278ba5ddbce9 (patch) | |
| tree | 1662df7a9a7114295c1d93c1195edd57cd72c465 /libjava/gnu | |
| parent | 9734e80cade2a318334a7b3f83ec787d07df80c4 (diff) | |
| download | gcc-a22add726841748f6c4051f8d9b4278ba5ddbce9.zip gcc-a22add726841748f6c4051f8d9b4278ba5ddbce9.tar.gz gcc-a22add726841748f6c4051f8d9b4278ba5ddbce9.tar.bz2 | |
Makefile.am: Added natTimeZone.cc.
* Makefile.am: Added natTimeZone.cc.
* Makefile.in: Rebuilt.
* gnu/gcj/text/LocaleData_en.java: Added DateFormat entries.
* java/text/DateFormatSymbols.java (ampms): Made package private.
(eras): Made package private.
(months): Made package private.
(shortMonths): Made package private.
(shortWeekdays): Made package private.
(weekdays): Made package private.
(formatPrefixes): New private field.
(localPatternCharsDefault): Made private.
(dateFormats): New package private field.
(timeFormats): New package private field.
(formatsForKey): New private method.
(DateFormatSymbols(Locale)): Set dateFormats and timeFormats.
(DateFormatSymbols(DateFormatSymbols)): Ditto.
* java/text/SimpleDateFormat.java: Merged with Classpath.
* java/util/TimeZone.java: Merged with Classpath.
* java/util/natTimeZone.cc: New file.
From-SVN: r37808
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/text/LocaleData_en.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libjava/gnu/gcj/text/LocaleData_en.java b/libjava/gnu/gcj/text/LocaleData_en.java index cd13db0..c24c1121 100644 --- a/libjava/gnu/gcj/text/LocaleData_en.java +++ b/libjava/gnu/gcj/text/LocaleData_en.java @@ -68,6 +68,16 @@ public final class LocaleData_en extends ListResourceBundle { "shortWeekdays", shortWeekdaysDefault }, { "weekdays", weekdaysDefault }, + // These are for DateFormat. + { "shortDateFormat", "M/d/yy" }, // Java's Y2K bug. + { "mediumDateFormat", "d-MMM-yy" }, + { "longDateFormat", "MMMM d, yyyy" }, + { "fullDateFormat", "EEEE MMMM d, yyyy G" }, + { "shortTimeFormat", "h:mm a" }, + { "mediumTimeFormat", "h:mm:ss a" }, + { "longTimeFormat", "h:mm:ss a z" }, + { "fullTimeFormat", "h:mm:ss;S 'o''clock' a z" }, + // For RuleBasedCollator. // FIXME: this is nowhere near complete. // In particular we must mark accents as ignorable, |