summaryrefslogtreecommitdiffstats
path: root/libjava/gnu
diff options
context:
space:
mode:
authorwarrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-28 03:09:22 +0000
committerwarrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-28 03:09:22 +0000
commit1fbe90973cde7a3c75bf3d48a0a533c218a635d3 (patch)
tree1662df7a9a7114295c1d93c1195edd57cd72c465 /libjava/gnu
parente878834be90739f89574a37d8303c85207eaefbc (diff)
downloadppe42-gcc-1fbe90973cde7a3c75bf3d48a0a533c218a635d3.tar.gz
ppe42-gcc-1fbe90973cde7a3c75bf3d48a0a533c218a635d3.zip
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
-rw-r--r--libjava/gnu/gcj/text/LocaleData_en.java10
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 cd13db0405d..c24c1121335 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,
OpenPOWER on IntegriCloud