diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-09 07:07:51 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-09 07:07:51 +0000 |
| commit | e6d0fc23849aa6b9a0b9b4173f19a3a64f997700 (patch) | |
| tree | 59c853c9c93930e645e808160cee16a1368a3fc2 /libjava/gnu | |
| parent | d32ccca71d726900c377e0f90ae22f273b809935 (diff) | |
| download | ppe42-gcc-e6d0fc23849aa6b9a0b9b4173f19a3a64f997700.tar.gz ppe42-gcc-e6d0fc23849aa6b9a0b9b4173f19a3a64f997700.zip | |
Fix for PR libgcj/1411:
* Makefile.am: Removed java/util/natTimeZone.cc.
* Makefile.in: Rebuilt.
* gnu/gcj/text/LocaleData_en_US.java (zoneStringsDefault): Added
missing localized timezone names.
* java/lang/System.java (getDefaultTimeZoneId): New private method.
* java/lang/natSystem.cc (getSystemTimeZone): New private method.
(init_properties): Set user.timezone property.
* java/text/DateFormatSymbols.java (zoneStringsDefault): Added
default timezone names; removed non-standard ones. Use standard
ID names per JCL.
* java/util/Date.java (toGMTString): Removed zoneGMT variable.
(UTC): Ditto.
* java/util/TimeZone.java: Add standard ID names per JCL; removed
non-standard ones.
(getDefaultTimeZoneId): Removed.
(zoneGMT): Removed.
(getDefaultTimeZoneId): Removed.
* java/util/natTimeZone.cc: Removed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38816 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/text/LocaleData_en_US.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libjava/gnu/gcj/text/LocaleData_en_US.java b/libjava/gnu/gcj/text/LocaleData_en_US.java index 083a86157f6..eb5d4f14be1 100644 --- a/libjava/gnu/gcj/text/LocaleData_en_US.java +++ b/libjava/gnu/gcj/text/LocaleData_en_US.java @@ -21,6 +21,8 @@ public final class LocaleData_en_US extends ListResourceBundle { // These are for DateFormatSymbols. static String[][] zoneStringsDefault = { + { "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", @@ -35,10 +37,18 @@ public final class LocaleData_en_US extends ListResourceBundle /**/ "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 Daylight Time", "HDT", "Honolulu" }, - { "AST", "Alaska Standard Time", "AST", - /**/ "Alaska Daylight Time", "ADT", "Anchorage" } + /**/ "Hawaii Standard Time", "HST", "Honolulu" }, + { "AST", "Alaska Standard Time", "AKST", + /**/ "Alaska Daylight Time", "AKDT", "Anchorage" } }; private static final Object[][] contents = |
