mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-18 11:14:22 +00:00
ICU-9867 New time zone pattern letters/types spport for CLDR 23/ICU 51.
X-SVN-Rev: 33157
This commit is contained in:
Yoshito Umaoka
parent
686c8d47f9
commit
98dafe28a3
13 changed files with 1819 additions and 746 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2011, International Business Machines Corporation and *
|
||||
* Copyright (C) 2011-2013, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
|
@ -22,6 +22,7 @@ import java.util.Map;
|
|||
import java.util.MissingResourceException;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import com.ibm.icu.impl.TextTrieMap.ResultHandler;
|
||||
import com.ibm.icu.text.TimeZoneNames;
|
||||
|
|
@ -164,10 +165,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
if (tzID == null || tzID.length() == 0) {
|
||||
return null;
|
||||
}
|
||||
String locName = loadTimeZoneNames(tzID).getLocationName();
|
||||
if (locName == null) {
|
||||
locName = super.getExemplarLocationName(tzID);
|
||||
}
|
||||
String locName = loadTimeZoneNames(tzID).getName(NameType.EXEMPLAR_LOCATION);
|
||||
return locName;
|
||||
}
|
||||
|
||||
|
|
@ -303,7 +301,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
private synchronized TZNames loadTimeZoneNames(String tzID) {
|
||||
TZNames tznames = _tzNamesMap.get(tzID);
|
||||
if (tznames == null) {
|
||||
tznames = TZNames.getInstance(_zoneStrings, tzID.replace('/', ':'));
|
||||
tznames = TZNames.getInstance(_zoneStrings, tzID.replace('/', ':'), tzID);
|
||||
// put names into the trie
|
||||
tzID = tzID.intern();
|
||||
for (NameType t : NameType.values()) {
|
||||
|
|
@ -442,6 +440,9 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
case SHORT_DAYLIGHT:
|
||||
name = _names[5];
|
||||
break;
|
||||
case EXEMPLAR_LOCATION:
|
||||
name = null; // implemented by subclass
|
||||
break;
|
||||
}
|
||||
|
||||
return name;
|
||||
|
|
@ -486,26 +487,25 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
|
||||
private static final TZNames EMPTY_TZNAMES = new TZNames(null, null);
|
||||
|
||||
public static TZNames getInstance(ICUResourceBundle zoneStrings, String key) {
|
||||
public static TZNames getInstance(ICUResourceBundle zoneStrings, String key, String tzID) {
|
||||
if (zoneStrings == null || key == null || key.length() == 0) {
|
||||
return EMPTY_TZNAMES;
|
||||
}
|
||||
|
||||
String[] names = loadData(zoneStrings, key);
|
||||
String locationName = null;
|
||||
|
||||
ICUResourceBundle table = null;
|
||||
try {
|
||||
table = zoneStrings.getWithFallback(key);
|
||||
} catch (MissingResourceException e) {
|
||||
return EMPTY_TZNAMES;
|
||||
}
|
||||
|
||||
String locationName = null;
|
||||
try {
|
||||
locationName = table.getStringWithFallback("ec");
|
||||
} catch (MissingResourceException e) {
|
||||
// location name is optional
|
||||
// fall through
|
||||
}
|
||||
|
||||
String[] names = loadData(zoneStrings, key);
|
||||
if (locationName == null) {
|
||||
locationName = getDefaultExemplarLocationName(tzID);
|
||||
}
|
||||
|
||||
if (locationName == null && names == null) {
|
||||
return EMPTY_TZNAMES;
|
||||
|
|
@ -513,8 +513,11 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
return new TZNames(names, locationName);
|
||||
}
|
||||
|
||||
public String getLocationName() {
|
||||
return _locationName;
|
||||
public String getName(NameType type) {
|
||||
if (type == NameType.EXEMPLAR_LOCATION) {
|
||||
return _locationName;
|
||||
}
|
||||
return super.getName(type);
|
||||
}
|
||||
|
||||
private TZNames(String[] names, String locationName) {
|
||||
|
|
@ -686,4 +689,25 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
|
|||
return map;
|
||||
}
|
||||
}
|
||||
|
||||
private static final Pattern LOC_EXCLUSION_PATTERN = Pattern.compile("Etc/.*|SystemV/.*|.*/Riyadh8[7-9]");
|
||||
|
||||
/**
|
||||
* Default exemplar location name based on time zone ID
|
||||
* @param tzID the time zone ID
|
||||
* @return the exemplar location name or null if location is not available.
|
||||
*/
|
||||
public static String getDefaultExemplarLocationName(String tzID) {
|
||||
if (tzID == null || tzID.length() == 0 || LOC_EXCLUSION_PATTERN.matcher(tzID).matches()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String location = null;
|
||||
int sep = tzID.lastIndexOf('/');
|
||||
if (sep > 0 && sep + 1 < tzID.length()) {
|
||||
location = tzID.substring(sep + 1).replace('_', ' ');
|
||||
}
|
||||
|
||||
return location;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -829,4 +829,56 @@ public final class ZoneMeta {
|
|||
}
|
||||
return zid.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the time zone's short ID for the zone.
|
||||
* For example, "uslax" for zone "America/Los_Angeles".
|
||||
* @param tz the time zone
|
||||
* @return the short ID of the time zone, or null if the short ID is not available.
|
||||
*/
|
||||
public static String getShortID(TimeZone tz) {
|
||||
String canonicalID = null;
|
||||
|
||||
if (tz instanceof OlsonTimeZone) {
|
||||
canonicalID = ((OlsonTimeZone)tz).getCanonicalID();
|
||||
}
|
||||
canonicalID = getCanonicalCLDRID(tz.getID());
|
||||
if (canonicalID == null) {
|
||||
return null;
|
||||
}
|
||||
return getShortIDFromCanonical(canonicalID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the time zone's short ID for the zone ID.
|
||||
* For example, "uslax" for zone ID "America/Los_Angeles".
|
||||
* @param id the time zone ID
|
||||
* @return the short ID of the time zone ID, or null if the short ID is not available.
|
||||
*/
|
||||
public static String getShortID(String id) {
|
||||
String canonicalID = getCanonicalCLDRID(id);
|
||||
if (canonicalID == null) {
|
||||
return null;
|
||||
}
|
||||
return getShortIDFromCanonical(canonicalID);
|
||||
}
|
||||
|
||||
private static String getShortIDFromCanonical(String canonicalID) {
|
||||
String shortID = null;
|
||||
String tzidKey = canonicalID.replace('/', ':');
|
||||
|
||||
try {
|
||||
// First, try check if the given ID is canonical
|
||||
UResourceBundle keyTypeData = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
|
||||
"keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
|
||||
UResourceBundle typeMap = keyTypeData.get("typeMap");
|
||||
UResourceBundle typeKeys = typeMap.get("timezone");
|
||||
shortID = typeKeys.getString(tzidKey);
|
||||
} catch (MissingResourceException e) {
|
||||
// fall through
|
||||
}
|
||||
|
||||
return shortID;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 1996-2012, International Business Machines
|
||||
* Copyright (C) 1996-2013, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*/
|
||||
|
||||
|
|
@ -407,12 +407,43 @@ public abstract class DateFormat extends UFormat {
|
|||
*/
|
||||
public final static int YEAR_NAME_FIELD = 30;
|
||||
|
||||
/**
|
||||
* {@icu} FieldPosition selector for 'O' field alignment,
|
||||
* corresponding to the {@link Calendar#ZONE_OFFSET} and
|
||||
* {@link Calendar#DST_OFFSET} fields. This displays the
|
||||
* localized GMT format.
|
||||
* @draft ICU 51
|
||||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
public final static int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31;
|
||||
|
||||
/**
|
||||
* {@icu} FieldPosition selector for 'X' field alignment,
|
||||
* corresponding to the {@link Calendar#ZONE_OFFSET} and
|
||||
* {@link Calendar#DST_OFFSET} fields. This displays the
|
||||
* ISO 8601 local time offset format or UTC indicator ("Z").
|
||||
* @draft ICU 51
|
||||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
public final static int TIMEZONE_ISO_FIELD = 32;
|
||||
|
||||
/**
|
||||
* {@icu} FieldPosition selector for 'x' field alignment,
|
||||
* corresponding to the {@link Calendar#ZONE_OFFSET} and
|
||||
* {@link Calendar#DST_OFFSET} fields. This displays the
|
||||
* ISO 8601 local time offset format.
|
||||
* @draft ICU 51
|
||||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
public final static int TIMEZONE_ISO_LOCAL_FIELD = 33;
|
||||
|
||||
/**
|
||||
* {@icu} Number of FieldPosition selectors for DateFormat.
|
||||
* Valid selectors range from 0 to FIELD_COUNT-1.
|
||||
* @stable ICU 3.0
|
||||
*/
|
||||
public final static int FIELD_COUNT = 31; // must == DateFormatSymbols.patternChars.length()
|
||||
|
||||
public final static int FIELD_COUNT = 34; // must == DateFormatSymbols.patternChars.length()
|
||||
|
||||
// Proclaim serial compatibility with 1.1 FCS
|
||||
private static final long serialVersionUID = 7218322306649953788L;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 1996-2012, International Business Machines Corporation and *
|
||||
* Copyright (C) 1996-2013, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
|
@ -514,7 +514,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
|
|||
* Unlocalized date-time pattern characters. For example: 'y', 'd', etc.
|
||||
* All locales use the same unlocalized pattern characters.
|
||||
*/
|
||||
static final String patternChars = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVU";
|
||||
static final String patternChars = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx";
|
||||
|
||||
/**
|
||||
* Localized date-time pattern characters. For example, a locale may
|
||||
|
|
|
|||
|
|
@ -98,8 +98,13 @@ import com.ibm.icu.util.ULocale.Category;
|
|||
* ZZZZZ time zone (ISO 8601) (Text & Number) -08:00 & Z (UTC)
|
||||
* v time zone (generic) (Text) PT
|
||||
* vvvv time zone (generic) (Text) Pacific Time
|
||||
* V time zone (abreviation) (Text) PST
|
||||
* VVVV time zone (location) (Text) United States Time (Los Angeles)
|
||||
* V time zone (short ID) (Text) uslax
|
||||
* VV time zone (ID) (Text) America/Los_Angeles
|
||||
* VVV time zone (exemplar) (Text) Los Angeles
|
||||
* VVVV time zone (location) (Text) Los Angeles Time
|
||||
* O time zone (GMT offset) (Text & Number) GMT-8 & GMT-08:00
|
||||
* X time zone (ISO 8601) (Text & Number) -08, -0800, -08:00 & Z (UTC)
|
||||
* x time zone (ISO 8601) (Number) -08, -0800 & -08:00
|
||||
* g* Julian day (Number) 2451334
|
||||
* A* milliseconds in day (Number) 69540000
|
||||
* Q* quarter in year (Text & Number) Q1 & 01
|
||||
|
|
@ -274,14 +279,14 @@ public class SimpleDateFormat extends DateFormat {
|
|||
*/
|
||||
private static final int[] PATTERN_CHAR_TO_LEVEL =
|
||||
{
|
||||
// A B C D E F G H I J K L M N O
|
||||
-1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, -1,
|
||||
// P Q R S T U V W X Y Z
|
||||
-1, 20, -1, 80, -1, 10, 0, 30, -1, 10, 0, -1, -1, -1, -1, -1,
|
||||
// a b c d e f g h i j k l m n o
|
||||
-1, 40, -1, 30, 30, 30, -1, 0, 50, -1, -1, 50, -1, 60, -1, -1,
|
||||
// p q r s t u v w x y z
|
||||
-1, 20, -1, 70, -1, 10, 0, 20, -1, 10, 0, -1, -1, -1, -1, -1
|
||||
// A B C D E F G H I J K L M N O
|
||||
-1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, 0,
|
||||
// P Q R S T U V W X Y Z
|
||||
-1, 20, -1, 80, -1, 10, 0, 30, 0, 10, 0, -1, -1, -1, -1, -1,
|
||||
// a b c d e f g h i j k l m n o
|
||||
-1, 40, -1, 30, 30, 30, -1, 0, 50, -1, -1, 50, -1, 60, -1, -1,
|
||||
// p q r s t u v w x y z
|
||||
-1, 20, -1, 70, -1, 10, 0, 20, 0, 10, 0, -1, -1, -1, -1, -1
|
||||
};
|
||||
|
||||
// When calendar uses hebr numbering (i.e. he@calendar=hebrew),
|
||||
|
|
@ -798,13 +803,13 @@ public class SimpleDateFormat extends DateFormat {
|
|||
private static final int[] PATTERN_CHAR_TO_INDEX =
|
||||
{
|
||||
// A B C D E F G H I J K L M N O
|
||||
-1, 22, -1, -1, 10, 9, 11, 0, 5, -1, -1, 16, 26, 2, -1, -1,
|
||||
-1, 22, -1, -1, 10, 9, 11, 0, 5, -1, -1, 16, 26, 2, -1, 31,
|
||||
// P Q R S T U V W X Y Z
|
||||
-1, 27, -1, 8, -1, 30, 29, 13, -1, 18, 23, -1, -1, -1, -1, -1,
|
||||
-1, 27, -1, 8, -1, 30, 29, 13, 32, 18, 23, -1, -1, -1, -1, -1,
|
||||
// a b c d e f g h i j k l m n o
|
||||
-1, 14, -1, 25, 3, 19, -1, 21, 15, -1, -1, 4, -1, 6, -1, -1,
|
||||
// p q r s t u v w x y z
|
||||
-1, 28, -1, 7, -1, 20, 24, 12, -1, 1, 17, -1, -1, -1, -1, -1
|
||||
-1, 28, -1, 7, -1, 20, 24, 12, 33, 1, 17, -1, -1, -1, -1, -1
|
||||
};
|
||||
|
||||
// Map pattern character index to Calendar field number
|
||||
|
|
@ -824,6 +829,8 @@ public class SimpleDateFormat extends DateFormat {
|
|||
/*Qq*/ Calendar.MONTH, Calendar.MONTH,
|
||||
/*V*/ Calendar.ZONE_OFFSET,
|
||||
/*U*/ Calendar.YEAR,
|
||||
/*O*/ Calendar.ZONE_OFFSET,
|
||||
/*Xx*/ Calendar.ZONE_OFFSET, Calendar.ZONE_OFFSET,
|
||||
};
|
||||
|
||||
// Map pattern character index to DateFormat field number
|
||||
|
|
@ -842,6 +849,8 @@ public class SimpleDateFormat extends DateFormat {
|
|||
/*Qq*/ DateFormat.QUARTER_FIELD, DateFormat.STANDALONE_QUARTER_FIELD,
|
||||
/*V*/ DateFormat.TIMEZONE_SPECIAL_FIELD,
|
||||
/*U*/ DateFormat.YEAR_NAME_FIELD,
|
||||
/*O*/ DateFormat.TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD,
|
||||
/*Xx*/ DateFormat.TIMEZONE_ISO_FIELD, DateFormat.TIMEZONE_ISO_LOCAL_FIELD,
|
||||
};
|
||||
|
||||
// Map pattern character index to DateFormat.Field
|
||||
|
|
@ -860,6 +869,8 @@ public class SimpleDateFormat extends DateFormat {
|
|||
/*Qq*/ DateFormat.Field.QUARTER, DateFormat.Field.QUARTER,
|
||||
/*V*/ DateFormat.Field.TIME_ZONE,
|
||||
/*U*/ DateFormat.Field.YEAR,
|
||||
/*O*/ DateFormat.Field.TIME_ZONE,
|
||||
/*Xx*/ DateFormat.Field.TIME_ZONE, DateFormat.Field.TIME_ZONE,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1114,7 +1125,8 @@ public class SimpleDateFormat extends DateFormat {
|
|||
zeroPaddingNumber(currentNumberFormat,buf, value, count, maxIntCount);
|
||||
}
|
||||
break;
|
||||
case 17: // 'z' - ZONE_OFFSET
|
||||
|
||||
case 17: // 'z' - TIMEZONE_FIELD
|
||||
if (count < 4) {
|
||||
// "z", "zz", "zzz"
|
||||
result = tzFormat().format(Style.SPECIFIC_SHORT, tz, date);
|
||||
|
|
@ -1125,22 +1137,20 @@ public class SimpleDateFormat extends DateFormat {
|
|||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
case 23: // 'Z' - TIMEZONE_RFC
|
||||
{
|
||||
case 23: // 'Z' - TIMEZONE_RFC_FIELD
|
||||
if (count < 4) {
|
||||
// RFC822 format
|
||||
result = tzFormat().format(Style.RFC822, tz, date);
|
||||
// RFC822 format - equivalent to ISO 8601 local offset fixed width format
|
||||
result = tzFormat().format(Style.ISO_BASIC_LOCAL_FULL, tz, date);
|
||||
} else if (count == 5) {
|
||||
// ISO 8601 extended format
|
||||
result = tzFormat().format(Style.ISO8601, tz, date);
|
||||
result = tzFormat().format(Style.ISO_EXTENDED_FULL, tz, date);
|
||||
} else {
|
||||
// long form, localized GMT pattern
|
||||
result = tzFormat().format(Style.LOCALIZED_GMT, tz, date);
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
}
|
||||
case 24: // 'v' - TIMEZONE_GENERIC
|
||||
case 24: // 'v' - TIMEZONE_GENERIC_FIELD
|
||||
if (count == 1) {
|
||||
// "v"
|
||||
result = tzFormat().format(Style.GENERIC_SHORT, tz, date);
|
||||
|
|
@ -1149,7 +1159,72 @@ public class SimpleDateFormat extends DateFormat {
|
|||
// "vvvv"
|
||||
result = tzFormat().format(Style.GENERIC_LONG, tz, date);
|
||||
capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_LONG;
|
||||
}
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
case 29: // 'V' - TIMEZONE_SPECIAL_FIELD
|
||||
if (count == 1) {
|
||||
// "V"
|
||||
result = tzFormat().format(Style.ZONE_ID_SHORT, tz, date);
|
||||
} else if (count == 2) {
|
||||
// "VV"
|
||||
result = tzFormat().format(Style.ZONE_ID, tz, date);
|
||||
} else if (count == 3) {
|
||||
// "VVV"
|
||||
result = tzFormat().format(Style.EXEMPLAR_LOCATION, tz, date);
|
||||
} else if (count == 4) {
|
||||
// "VVVV"
|
||||
result = tzFormat().format(Style.GENERIC_LOCATION, tz, date);
|
||||
capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ZONE_LONG;
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
case 31: // 'O' - TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD
|
||||
if (count == 1) {
|
||||
// "O" - Short Localized GMT format
|
||||
result = tzFormat().format(Style.LOCALIZED_GMT_SHORT, tz, date);
|
||||
} else if (count == 4) {
|
||||
// "OOOO" - Localized GMT format
|
||||
result = tzFormat().format(Style.LOCALIZED_GMT, tz, date);
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
case 32: // 'X' - TIMEZONE_ISO_FIELD
|
||||
if (count == 1) {
|
||||
// "X" - ISO Basic/Short
|
||||
result = tzFormat().format(Style.ISO_BASIC_SHORT, tz, date);
|
||||
} else if (count == 2) {
|
||||
// "XX" - ISO Basic/Fixed
|
||||
result = tzFormat().format(Style.ISO_BASIC_FIXED, tz, date);
|
||||
} else if (count == 3) {
|
||||
// "XXX" - ISO Extended/Fixed
|
||||
result = tzFormat().format(Style.ISO_EXTENDED_FIXED, tz, date);
|
||||
} else if (count == 4) {
|
||||
// "XXXX" - ISO Basic/Optional second field
|
||||
result = tzFormat().format(Style.ISO_BASIC_FULL, tz, date);
|
||||
} else if (count == 5) {
|
||||
// "XXXXX" - ISO Extended/Optional second field
|
||||
result = tzFormat().format(Style.ISO_EXTENDED_FULL, tz, date);
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
case 33: // 'x' - TIMEZONE_ISO_LOCAL_FIELD
|
||||
if (count == 1) {
|
||||
// "x" - ISO Local Basic/Short
|
||||
result = tzFormat().format(Style.ISO_BASIC_LOCAL_SHORT, tz, date);
|
||||
} else if (count == 2) {
|
||||
// "x" - ISO Local Basic/Fixed
|
||||
result = tzFormat().format(Style.ISO_BASIC_LOCAL_FIXED, tz, date);
|
||||
} else if (count == 3) {
|
||||
// "xxx" - ISO Local Extended/Fixed
|
||||
result = tzFormat().format(Style.ISO_EXTENDED_LOCAL_FIXED, tz, date);
|
||||
} else if (count == 4) {
|
||||
// "xxxx" - ISO Local Basic/Optional second field
|
||||
result = tzFormat().format(Style.ISO_BASIC_LOCAL_FULL, tz, date);
|
||||
} else if (count == 5) {
|
||||
// "xxxxx" - ISO Local Extended/Optional second field
|
||||
result = tzFormat().format(Style.ISO_EXTENDED_LOCAL_FULL, tz, date);
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
|
||||
|
|
@ -1190,18 +1265,6 @@ public class SimpleDateFormat extends DateFormat {
|
|||
zeroPaddingNumber(currentNumberFormat,buf, (value/3)+1, count, maxIntCount);
|
||||
}
|
||||
break;
|
||||
case 29: // 'V' - TIMEZONE_SPECIAL
|
||||
if (count == 1) {
|
||||
// "V"
|
||||
result = tzFormat().format(Style.SPECIFIC_SHORT, tz, date);
|
||||
capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.METAZONE_SHORT;
|
||||
} else if (count == 4) {
|
||||
// "VVVV"
|
||||
result = tzFormat().format(Style.GENERIC_LOCATION, tz, date);
|
||||
capContextUsageType = DateFormatSymbols.CapitalizationContextUsage.ZONE_LONG;
|
||||
}
|
||||
buf.append(result);
|
||||
break;
|
||||
default:
|
||||
// case 3: // 'd' - DATE
|
||||
// case 5: // 'H' - HOUR_OF_DAY (0..23)
|
||||
|
|
@ -2409,11 +2472,11 @@ public class SimpleDateFormat extends DateFormat {
|
|||
return pos.getIndex();
|
||||
}
|
||||
return -start;
|
||||
}
|
||||
}
|
||||
case 23: // 'Z' - TIMEZONE_RFC
|
||||
{
|
||||
Output<TimeType> tzTimeType = new Output<TimeType>();
|
||||
Style style = (count < 4) ? Style.RFC822 : ((count == 5) ? Style.ISO8601 : Style.LOCALIZED_GMT);
|
||||
Style style = (count < 4) ? Style.ISO_BASIC_LOCAL_FULL : ((count == 5) ? Style.ISO_EXTENDED_FULL : Style.LOCALIZED_GMT);
|
||||
TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
|
||||
if (tz != null) {
|
||||
tztype = tzTimeType.value;
|
||||
|
|
@ -2438,8 +2501,91 @@ public class SimpleDateFormat extends DateFormat {
|
|||
case 29: // 'V' - TIMEZONE_SPECIAL
|
||||
{
|
||||
Output<TimeType> tzTimeType = new Output<TimeType>();
|
||||
// Note: 'v' only supports count 1 and 4
|
||||
Style style = (count < 4) ? Style.SPECIFIC_SHORT : Style.GENERIC_LOCATION;
|
||||
Style style = null;
|
||||
switch (count) {
|
||||
case 1:
|
||||
style = Style.ZONE_ID_SHORT;
|
||||
break;
|
||||
case 2:
|
||||
style = Style.ZONE_ID;
|
||||
break;
|
||||
case 3:
|
||||
style = Style.EXEMPLAR_LOCATION;
|
||||
break;
|
||||
default:
|
||||
style = Style.GENERIC_LOCATION;
|
||||
break;
|
||||
}
|
||||
TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
|
||||
if (tz != null) {
|
||||
tztype = tzTimeType.value;
|
||||
cal.setTimeZone(tz);
|
||||
return pos.getIndex();
|
||||
}
|
||||
return -start;
|
||||
}
|
||||
case 31: // 'O' - TIMEZONE_LOCALIZED_GMT_OFFSET
|
||||
{
|
||||
Output<TimeType> tzTimeType = new Output<TimeType>();
|
||||
Style style = (count < 4) ? Style.LOCALIZED_GMT_SHORT : Style.LOCALIZED_GMT;
|
||||
TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
|
||||
if (tz != null) {
|
||||
tztype = tzTimeType.value;
|
||||
cal.setTimeZone(tz);
|
||||
return pos.getIndex();
|
||||
}
|
||||
return -start;
|
||||
}
|
||||
case 32: // 'X' - TIMEZONE_ISO
|
||||
{
|
||||
Output<TimeType> tzTimeType = new Output<TimeType>();
|
||||
Style style;
|
||||
switch (count) {
|
||||
case 1:
|
||||
style = Style.ISO_BASIC_SHORT;
|
||||
break;
|
||||
case 2:
|
||||
style = Style.ISO_BASIC_FIXED;
|
||||
break;
|
||||
case 3:
|
||||
style = Style.ISO_EXTENDED_FIXED;
|
||||
break;
|
||||
case 4:
|
||||
style = Style.ISO_BASIC_FULL;
|
||||
break;
|
||||
default: // count >= 5
|
||||
style = Style.ISO_EXTENDED_FULL;
|
||||
break;
|
||||
}
|
||||
TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
|
||||
if (tz != null) {
|
||||
tztype = tzTimeType.value;
|
||||
cal.setTimeZone(tz);
|
||||
return pos.getIndex();
|
||||
}
|
||||
return -start;
|
||||
}
|
||||
case 33: // 'x' - TIMEZONE_ISO_LOCAL
|
||||
{
|
||||
Output<TimeType> tzTimeType = new Output<TimeType>();
|
||||
Style style;
|
||||
switch (count) {
|
||||
case 1:
|
||||
style = Style.ISO_BASIC_LOCAL_SHORT;
|
||||
break;
|
||||
case 2:
|
||||
style = Style.ISO_BASIC_LOCAL_FIXED;
|
||||
break;
|
||||
case 3:
|
||||
style = Style.ISO_EXTENDED_LOCAL_FIXED;
|
||||
break;
|
||||
case 4:
|
||||
style = Style.ISO_BASIC_LOCAL_FULL;
|
||||
break;
|
||||
default: // count >= 5
|
||||
style = Style.ISO_EXTENDED_LOCAL_FULL;
|
||||
break;
|
||||
}
|
||||
TimeZone tz = tzFormat().parse(style, text, pos, tzTimeType);
|
||||
if (tz != null) {
|
||||
tztype = tzTimeType.value;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2011, International Business Machines Corporation and *
|
||||
* Copyright (C) 2011-2013, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
|
@ -11,10 +11,10 @@ import java.util.Collection;
|
|||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import com.ibm.icu.impl.ICUConfig;
|
||||
import com.ibm.icu.impl.SoftCache;
|
||||
import com.ibm.icu.impl.TimeZoneNamesImpl;
|
||||
import com.ibm.icu.util.TimeZone;
|
||||
import com.ibm.icu.util.ULocale;
|
||||
|
||||
|
|
@ -119,6 +119,13 @@ public abstract class TimeZoneNames implements Serializable {
|
|||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
SHORT_DAYLIGHT,
|
||||
/**
|
||||
* Exemplar location name, such as "Los Angeles".
|
||||
*
|
||||
* @draft ICU 51
|
||||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
EXEMPLAR_LOCATION,
|
||||
}
|
||||
|
||||
private static Cache TZNAMES_CACHE = new Cache();
|
||||
|
|
@ -126,7 +133,6 @@ public abstract class TimeZoneNames implements Serializable {
|
|||
private static final Factory TZNAMES_FACTORY;
|
||||
private static final String FACTORY_NAME_PROP = "com.ibm.icu.text.TimeZoneNames.Factory.impl";
|
||||
private static final String DEFAULT_FACTORY_CLASS = "com.ibm.icu.impl.TimeZoneNamesFactoryImpl";
|
||||
private static final Pattern LOC_EXCLUSION_PATTERN = Pattern.compile("Etc/.*|SystemV/.*|.*/Riyadh8[7-9]");
|
||||
|
||||
static {
|
||||
Factory factory = null;
|
||||
|
|
@ -295,17 +301,7 @@ public abstract class TimeZoneNames implements Serializable {
|
|||
* @provisional This API might change or be removed in a future release.
|
||||
*/
|
||||
public String getExemplarLocationName(String tzID) {
|
||||
if (tzID == null || tzID.length() == 0 || LOC_EXCLUSION_PATTERN.matcher(tzID).matches()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String location = null;
|
||||
int sep = tzID.lastIndexOf('/');
|
||||
if (sep > 0 && sep + 1 < tzID.length()) {
|
||||
location = tzID.substring(sep + 1).replace('_', ' ');
|
||||
}
|
||||
|
||||
return location;
|
||||
return TimeZoneNamesImpl.getDefaultExemplarLocationName(tzID);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* @(#)TimeZone.java 1.51 00/01/19
|
||||
*
|
||||
* Copyright (C) 1996-2012, International Business Machines
|
||||
* Copyright (C) 1996-2013, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*/
|
||||
|
||||
|
|
@ -561,7 +561,8 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
|
|||
if (daylight && timeType.value == TimeType.STANDARD ||
|
||||
!daylight && timeType.value == TimeType.DAYLIGHT) {
|
||||
int offset = daylight ? getRawOffset() + getDSTSavings() : getRawOffset();
|
||||
result = tzfmt.formatOffsetLocalizedGMT(offset);
|
||||
result = (style == SHORT_GENERIC) ?
|
||||
tzfmt.formatOffsetShortLocalizedGMT(offset) : tzfmt.formatOffsetLocalizedGMT(offset);
|
||||
}
|
||||
|
||||
} else if (style == LONG_GMT || style == SHORT_GMT) {
|
||||
|
|
@ -573,7 +574,7 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
|
|||
result = tzfmt.formatOffsetLocalizedGMT(offset);
|
||||
break;
|
||||
case SHORT_GMT:
|
||||
result = tzfmt.formatOffsetRFC822(offset);
|
||||
result = tzfmt.formatOffsetISO8601Basic(offset, false, false, false);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -598,7 +599,8 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
|
|||
// Fallback to localized GMT
|
||||
TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(locale);
|
||||
int offset = daylight && useDaylightTime() ? getRawOffset() + getDSTSavings() : getRawOffset();
|
||||
result = tzfmt.formatOffsetLocalizedGMT(offset);
|
||||
result = (style == LONG) ?
|
||||
tzfmt.formatOffsetLocalizedGMT(offset) : tzfmt.formatOffsetShortLocalizedGMT(offset);
|
||||
}
|
||||
}
|
||||
assert(result != null);
|
||||
|
|
|
|||
|
|
@ -339,18 +339,25 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
// Expected output field values for above DateFormats on aug13
|
||||
// Fields are given in order of DateFormat field number
|
||||
final String EXPECTED[] = {
|
||||
"", "1997", "August", "13", "", "", "34", "12", "",
|
||||
"Wednesday", "", "", "", "", "PM", "2", "", "Pacific Daylight Time", "", "", "", "", "", "", "","","","","","","",
|
||||
"", "1997", "August", "13", "", "", "34", "12", "", "Wednesday",
|
||||
"", "", "", "", "PM", "2", "", "Pacific Daylight Time", "", "",
|
||||
"", "", "", "", "", "", "", "", "", "",
|
||||
"", "", "", "",
|
||||
|
||||
"", "1997", "ao\u00FBt", "13", "", "14", "34", "12", "",
|
||||
"mercredi", "", "", "", "", "", "", "", "heure avanc\u00E9e du Pacifique", "", "", "", "", "", "", "","","","","","","",
|
||||
"", "1997", "ao\u00FBt", "13", "", "14", "34", "12", "", "mercredi",
|
||||
"", "", "", "", "", "", "", "heure avanc\u00E9e du Pacifique", "", "",
|
||||
"", "", "", "", "", "", "", "", "", "",
|
||||
"", "", "", "",
|
||||
|
||||
"AD", "1997", "8", "13", "14", "14", "34", "12", "5",
|
||||
"Wed", "225", "2", "33", "3", "PM", "2", "2", "PDT", "1997", "4", "1997", "2450674", "52452513", "-0700", "PT","4","8","3","3","PDT","1997",
|
||||
"AD", "1997", "8", "13", "14", "14", "34", "12", "5", "Wed",
|
||||
"225", "2", "33", "3", "PM", "2", "2", "PDT", "1997", "4",
|
||||
"1997", "2450674", "52452513", "-0700", "PT", "4", "8", "3", "3", "uslax",
|
||||
"1997", "GMT-7", "-07", "-07",
|
||||
|
||||
"Anno Domini", "1997", "August", "0013", "0014", "0014", "0034", "0012", "5130",
|
||||
"Wednesday", "0225", "0002", "0033", "0003", "PM", "0002", "0002", "Pacific Daylight Time", "1997",
|
||||
"Wednesday", "1997", "2450674", "52452513", "GMT-07:00", "Pacific Time","Wednesday","August", "3rd quarter", "3rd quarter","Los Angeles Time","1997",
|
||||
"Anno Domini", "1997", "August", "0013", "0014", "0014", "0034", "0012", "5130", "Wednesday",
|
||||
"0225", "0002", "0033", "0003", "PM", "0002", "0002", "Pacific Daylight Time", "1997", "Wednesday",
|
||||
"1997", "2450674", "52452513", "GMT-07:00", "Pacific Time", "Wednesday", "August", "3rd quarter", "3rd quarter", "Los Angeles Time",
|
||||
"1997", "GMT-07:00", "-0700", "-0700",
|
||||
};
|
||||
|
||||
assertTrue("data size", EXPECTED.length == COUNT * DateFormat.FIELD_COUNT);
|
||||
|
|
@ -453,7 +460,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
/**
|
||||
* This MUST be kept in sync with DateFormatSymbols.patternChars.
|
||||
*/
|
||||
static final String PATTERN_CHARS = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVU";
|
||||
static final String PATTERN_CHARS = "GyMdkHmsSEDFwWahKzYeugAZvcLQqVUOXx";
|
||||
|
||||
/**
|
||||
* A list of the DateFormat.Field.
|
||||
|
|
@ -491,6 +498,9 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
DateFormat.Field.QUARTER, // q
|
||||
DateFormat.Field.TIME_ZONE, // V
|
||||
DateFormat.Field.YEAR, // U
|
||||
DateFormat.Field.TIME_ZONE, // O
|
||||
DateFormat.Field.TIME_ZONE, // X
|
||||
DateFormat.Field.TIME_ZONE, // x
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -529,6 +539,9 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
"STAND_ALONE_QUARTER_FIELD",
|
||||
"TIMEZONE_SPECIAL_FIELD",
|
||||
"YEAR_NAME_FIELD",
|
||||
"TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD",
|
||||
"TIMEZONE_ISO_FIELD",
|
||||
"TIMEZONE_ISO_LOCAL_FIELD",
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -723,26 +736,22 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
|
||||
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZZ", "-08:00", "-8:00" },
|
||||
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "PST", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "PST", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Pacific Standard Time", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "PDT", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "PDT", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Pacific Daylight Time", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "PT", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Pacific Time", "America/Los_Angeles" },
|
||||
{ "en", "America/Los_Angeles", "2004-07-15T00:00:00Z", "VVVV", "Los Angeles Time", "America/Los_Angeles" },
|
||||
{ "en_GB", "America/Los_Angeles", "2004-01-15T12:00:00Z", "z", "GMT-08:00", "America/Los_Angeles" },
|
||||
{ "en_GB", "America/Los_Angeles", "2004-01-15T12:00:00Z", "z", "GMT-8", "America/Los_Angeles" },
|
||||
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "z", "MST", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "V", "MST", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-01-15T00:00:00Z", "zzzz", "Mountain Standard Time", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "z", "MST", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "V", "MST", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "zzzz", "Mountain Standard Time", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "v", "MST", "America/Phoenix" },
|
||||
{ "en", "America/Phoenix", "2004-07-15T00:00:00Z", "vvvv", "Mountain Standard Time", "America/Phoenix" },
|
||||
|
|
@ -750,13 +759,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Time", "America/Buenos_Aires" },
|
||||
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
|
||||
|
|
@ -764,13 +771,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Time", "America/Buenos_Aires" },
|
||||
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
|
||||
|
|
@ -778,13 +783,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "GMT-05:00", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "GMT-04:00", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "v", "Cuba Time", "America/Havana" },
|
||||
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
|
||||
|
|
@ -792,13 +795,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "V", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "V", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" },
|
||||
{ "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
|
||||
|
|
@ -806,13 +807,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "V", "GMT+11:00", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "V", "GMT+10:00", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" },
|
||||
{ "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
|
||||
|
|
@ -821,12 +820,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
|
||||
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
|
||||
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
|
||||
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
|
||||
{ "en", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Greenwich Mean Time", "+0:00" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "Europe/London" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "V", "GMT+01:00", "Europe/London" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "Europe/London" },
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "British Summer Time", "Europe/London" },
|
||||
// icu en.txt has exemplar city for this time zone
|
||||
{ "en", "Europe/London", "2004-07-15T00:00:00Z", "v", "United Kingdom Time", "Europe/London" },
|
||||
|
|
@ -835,25 +832,23 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
|
||||
{ "en", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "GMT+05:30", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "GMT+05:30", "+05:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "India Time", "Asia/Calcutta" },
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
|
||||
|
|
@ -866,44 +861,44 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "-8:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "-8:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Nordamerikanische Westk\u00fcsten-Normalzeit", "-8:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "-7:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Nordamerikanische Westk\u00fcsten-Sommerzeit", "-7:00" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles Zeit", "America/Los_Angeles" },
|
||||
{ "de", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Nordamerikanische Westk\u00fcstenzeit", "America/Los_Angeles" },
|
||||
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Zeit", "America/Buenos_Aires" },
|
||||
{ "de", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentinische Normalzeit", "America/Buenos_Aires" },
|
||||
|
||||
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentinische Normalzeit", "-3:00" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires Zeit", "America/Buenos_Aires" },
|
||||
{ "de", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentinische Normalzeit", "America/Buenos_Aires" },
|
||||
|
||||
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
|
||||
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
|
||||
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
|
||||
{ "de", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Kubanische Normalzeit", "-5:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Kubanische Sommerzeit", "-4:00" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "v", "Kuba Zeit", "America/Havana" },
|
||||
{ "de", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Kubanische Zeit", "America/Havana" },
|
||||
|
|
@ -913,22 +908,22 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "de", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Ostaustralische Sommerzeit", "+11:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Ostaustralische Normalzeit", "+10:00" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Zeit", "Australia/Sydney" },
|
||||
{ "de", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Ostaustralische Zeit", "Australia/Sydney" },
|
||||
|
||||
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "de", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Ostaustralische Sommerzeit", "+11:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Ostaustralische Normalzeit", "+10:00" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Zeit", "Australia/Sydney" },
|
||||
{ "de", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Ostaustralische Zeit", "Australia/Sydney" },
|
||||
|
|
@ -939,30 +934,30 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "de", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Mittlere Greenwich-Zeit", "+0:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "Britische Sommerzeit", "+1:00" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "v", "Vereinigtes K\u00f6nigreich Zeit", "Europe/London" },
|
||||
{ "de", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "Vereinigtes K\u00f6nigreich Zeit", "Europe/London" },
|
||||
|
||||
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
|
||||
{ "de", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "Indische Zeit", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "Indische Zeit", "+5:30" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "Indien Zeit", "Asia/Calcutta" },
|
||||
{ "de", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "Indische Zeit", "Asia/Calcutta" },
|
||||
|
|
@ -971,11 +966,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0800", "-8:00" },
|
||||
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0800", "America/Los_Angeles" },
|
||||
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-8", "America/Los_Angeles" },
|
||||
{ "zh", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\u5317\u7f8e\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "America/Los_Angeles" },
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0700", "-7:00" },
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0700", "America/Los_Angeles" },
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-7", "America/Los_Angeles" },
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\u5317\u7f8e\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6\u95f4", "America/Los_Angeles" },
|
||||
// icu zh.txt has exemplar city for this time zone
|
||||
{ "zh", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\u6D1B\u6749\u77F6\u65F6\u95F4", "America/Los_Angeles" },
|
||||
|
|
@ -983,11 +978,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u963f\u6839\u5ef7\u6807\u51c6\u65f6\u95f4", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u963f\u6839\u5ef7\u6807\u51c6\u65f6\u95f4", "-3:00" },
|
||||
// icu zh.txt does not have info for this time zone
|
||||
{ "zh", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u5E03\u5B9C\u8BFA\u65AF\u827E\u5229\u65AF\u65F6\u95F4", "America/Buenos_Aires" },
|
||||
|
|
@ -995,44 +990,44 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u963f\u6839\u5ef7\u6807\u51c6\u65f6\u95f4", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u963f\u6839\u5ef7\u6807\u51c6\u65f6\u95f4", "-3:00" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u5E03\u5B9C\u8BFA\u65AF\u827E\u5229\u65AF\u65F6\u95F4", "America/Buenos_Aires" },
|
||||
{ "zh", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u963f\u6839\u5ef7\u6807\u51c6\u65f6\u95f4", "America/Buenos_Aires" },
|
||||
|
||||
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0500", "-5:00" },
|
||||
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0500", "-5:00" },
|
||||
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-5", "-5:00" },
|
||||
{ "zh", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "-5:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0400", "-4:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0400", "-4:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-4", "-4:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\u53e4\u5df4\u590f\u4ee4\u65f6\u95f4", "-4:00" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u53e4\u5df4\u65f6\u95f4", "America/Havana" },
|
||||
{ "zh", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u53e4\u5df4\u65f6\u95f4", "America/Havana" },
|
||||
|
||||
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"+1100", "+11:00" },
|
||||
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+1100", "+11:00" },
|
||||
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+11", "+11:00" },
|
||||
{ "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u590f\u4ee4\u65f6\u95f4", "+11:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+1000", "+10:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+1000", "+10:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+10", "+10:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "+10:00" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\u6089\u5C3C\u65F6\u95F4", "Australia/Sydney" },
|
||||
{ "zh", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u65f6\u95f4", "Australia/Sydney" },
|
||||
|
||||
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"+1100", "+11:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+1100", "+11:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+11", "+11:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u590f\u4ee4\u65f6\u95f4", "+11:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+1000", "+10:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+1000", "+10:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+10", "+10:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "+10:00" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\u6089\u5C3C\u65F6\u95F4", "Australia/Sydney" },
|
||||
{ "zh", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u65f6\u95f4", "Australia/Sydney" },
|
||||
|
|
@ -1040,12 +1035,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
|
||||
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH, "+0:00" },
|
||||
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
|
||||
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
|
||||
{ "zh", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\u683C\u6797\u5C3C\u6CBB\u6807\u51C6\u65F6\u95F4", "+0:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+0100", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+0100", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", GMT_ZH+"+0100", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+1", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "\u82f1\u56fd\u590f\u4ee4\u65f6\u95f4", "+1:00" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },
|
||||
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },
|
||||
|
|
@ -1053,23 +1046,23 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", GMT_ZH+"-0300", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", GMT_ZH+"-3", "-3:00" },
|
||||
{ "zh", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", GMT_ZH+"-0300", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"+0530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+0530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", GMT_ZH+"+530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\u5370\u5ea6\u65f6\u95f4", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+0530", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+0530", "+05:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+530", "+05:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\u5370\u5ea6\u65f6\u95f4", "+5:30" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\u5370\u5ea6\u65f6\u95f4", "Asia/Calcutta" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\u5370\u5EA6\u65f6\u95f4", "Asia/Calcutta" },
|
||||
|
|
@ -1082,66 +1075,66 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "-8:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "-8:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\u092a\u094d\u0930\u0936\u093e\u0902\u0924\u0020\u092e\u093e\u0928\u0915\u0020\u0938\u092e\u092f", "-8:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "-7:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\u092A\u094D\u0930\u0936\u093E\u0902\u0924 \u0926\u093F\u0935\u093E\u0935\u0932\u094B\u0915 \u0938\u092E\u092F", "-7:00" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\u0932\u094B\u0938 \u090F\u0902\u091C\u093F\u0932\u0947\u0938 \u0938\u092E\u092F", "America/Los_Angeles" },
|
||||
{ "hi", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "\u092A\u094D\u0930\u0936\u093E\u0902\u0924 \u0938\u092E\u092F", "America/Los_Angeles" },
|
||||
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u092C\u094D\u092F\u0942\u0928\u0938 \u0906\u092F\u0930\u0938 \u0938\u092E\u092F", "America/Buenos_Aires" },
|
||||
{ "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "America/Buenos_Aires" },
|
||||
|
||||
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u092C\u094D\u092F\u0942\u0928\u0938 \u0906\u092F\u0930\u0938 \u0938\u092E\u092F", "America/Buenos_Aires" },
|
||||
{ "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "America/Buenos_Aires" },
|
||||
|
||||
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
|
||||
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
|
||||
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
|
||||
{ "hi", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\u0915\u094d\u092f\u0942\u092c\u093e \u0915\u093e \u092e\u093e\u0928\u0915 \u0938\u092e\u092f", "-5:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\u0915\u094d\u092f\u0942\u092c\u093e \u0915\u093e \u0921\u0947\u0932\u093e\u0907\u091f \u091f\u093e\u0907\u092e", "-4:00" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u0915\u094d\u092f\u0942\u092c\u093e \u0938\u092E\u092F", "America/Havana" },
|
||||
{ "hi", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u0915\u094d\u092f\u0942\u092c\u093e \u0915\u093e \u0938\u092E\u092F", "America/Havana" },
|
||||
|
||||
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "hi", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\u0911\u0938\u094D\u200D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u092A\u0942\u0930\u094D\u0935\u0940 \u0926\u093F\u0935\u093E\u0935\u0932\u094B\u0915 \u0938\u092E\u092F", "+11:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\u0911\u0938\u094D\u200D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u092A\u0942\u0930\u094D\u0935\u0940 \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "+10:00" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\u0938\u093F\u0921\u0928\u0940 \u0938\u092E\u092F", "Australia/Sydney" },
|
||||
{ "hi", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "\u092A\u0942\u0930\u094D\u0935\u0940 \u0911\u0938\u094D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u0938\u092E\u092F", "Australia/Sydney" },
|
||||
|
||||
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\u0911\u0938\u094D\u200D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u092A\u0942\u0930\u094D\u0935\u0940 \u0926\u093F\u0935\u093E\u0935\u0932\u094B\u0915 \u0938\u092E\u092F", "+11:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\u0911\u0938\u094D\u200D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u092A\u0942\u0930\u094D\u0935\u0940 \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "+10:00" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\u0938\u093F\u0921\u0928\u0940 \u0938\u092E\u092F", "Australia/Sydney" },
|
||||
{ "hi", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\u092A\u0942\u0930\u094D\u0935\u0940 \u0911\u0938\u094D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E\u0908 \u0938\u092E\u092F", "Australia/Sydney" },
|
||||
|
|
@ -1152,20 +1145,20 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "hi", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\u0917\u094d\u0930\u0940\u0928\u0935\u093f\u091a \u092e\u0940\u0928 \u091f\u093e\u0907\u092e", "+0:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "GMT+01:00", "+1:00" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u092C\u094D\u0930\u093F\u091F\u0947\u0928 \u0938\u092E\u092F", "Europe/London" },
|
||||
{ "hi", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u092C\u094D\u0930\u093F\u091F\u0947\u0928 \u0938\u092E\u092F", "Europe/London" },
|
||||
|
||||
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
|
||||
{ "hi", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
|
||||
|
||||
{ "hi", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
|
|
@ -1183,13 +1176,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"-0800", "-8:00" },
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", GMT_BG+"-0800", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", GMT_BG+"-0800", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", GMT_BG+"-8", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\u0422\u0438\u0445\u043E\u043E\u043A\u0435\u0430\u043D\u0441\u043A\u0430 \u0447\u0430\u0441\u043E\u0432\u0430 \u0437\u043E\u043D\u0430", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"-0700", "-7:00" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", GMT_BG+"-0700", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", GMT_BG+"-0700", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", GMT_BG+"-7", "America/Los_Angeles" },
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\u0422\u0438\u0445\u043E\u043E\u043A\u0435\u0430\u043D\u0441\u043A\u0430 \u043B\u044F\u0442\u043D\u0430 \u0447\u0430\u0441\u043E\u0432\u0430 \u0437\u043E\u043D\u0430", "America/Los_Angeles" },
|
||||
// icu bg.txt has exemplar city for this time zone
|
||||
{ "bg", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\u041B\u043E\u0441 \u0410\u043D\u0436\u0435\u043B\u0438\u0441 \u0432\u0440\u0435\u043C\u0435", "America/Los_Angeles" },
|
||||
|
|
@ -1198,22 +1189,22 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430 \u2013 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430 \u2013 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "-3:00" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u0411\u0443\u0435\u043D\u043E\u0441 \u0410\u0439\u0440\u0435\u0441 \u0432\u0440\u0435\u043C\u0435", "America/Buenos_Aires" },
|
||||
{ "bg", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430 \u2013 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "America/Buenos_Aires" },
|
||||
|
||||
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430 \u2013 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430 \u2013 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "-3:00" },
|
||||
// icu bg.txt does not have info for this time zone
|
||||
{ "bg", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u0411\u0443\u0435\u043D\u043E\u0441 \u0410\u0439\u0440\u0435\u0441 \u0432\u0440\u0435\u043C\u0435", "America/Buenos_Aires" },
|
||||
|
|
@ -1221,33 +1212,33 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"-0500", "-5:00" },
|
||||
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "z", GMT_BG+"-0500", "-5:00" },
|
||||
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "z", GMT_BG+"-5", "-5:00" },
|
||||
{ "bg", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\u041a\u0443\u0431\u0438\u043d\u0441\u043a\u043e \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "-5:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"-0400", "-4:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "z", GMT_BG+"-0400", "-4:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "z", GMT_BG+"-4", "-4:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\u041a\u0443\u0431\u0438\u043d\u0441\u043a\u043e \u043b\u044f\u0442\u043d\u043e \u0447\u0430\u0441\u043e\u0432\u043e \u0432\u0440\u0435\u043c\u0435", "-4:00" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u041a\u0443\u0431\u0430 \u0432\u0440\u0435\u043C\u0435", "America/Havana" },
|
||||
{ "bg", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u041a\u0443\u0431\u0438\u043d\u0441\u043a\u043e \u0432\u0440\u0435\u043C\u0435", "America/Havana" },
|
||||
|
||||
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"+1100", "+11:00" },
|
||||
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "z", GMT_BG+"+1100", "+11:00" },
|
||||
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "z", GMT_BG+"+11", "+11:00" },
|
||||
{ "bg", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u043B\u044F\u0442\u043D\u043E \u0447\u0430\u0441\u043E\u0432\u043E \u0432\u0440\u0435\u043C\u0435", "+11:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"+1000", "+10:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "z", GMT_BG+"+1000", "+10:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "z", GMT_BG+"+10", "+10:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u043E \u0432\u0440\u0435\u043C\u0435", "+10:00" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\u0421\u0438\u0434\u043D\u0438 \u0432\u0440\u0435\u043C\u0435", "Australia/Sydney" },
|
||||
{ "bg", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u0432\u0440\u0435\u043C\u0435", "Australia/Sydney" },
|
||||
|
||||
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"+1100", "+11:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", GMT_BG+"+1100", "+11:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", GMT_BG+"+11", "+11:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u043B\u044F\u0442\u043D\u043E \u0447\u0430\u0441\u043E\u0432\u043E \u0432\u0440\u0435\u043C\u0435", "+11:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"+1000", "+10:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", GMT_BG+"+1000", "+10:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", GMT_BG+"+10", "+10:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u043E \u0432\u0440\u0435\u043C\u0435", "+10:00" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\u0421\u0438\u0434\u043D\u0438 \u0432\u0440\u0435\u043C\u0435", "Australia/Sydney" },
|
||||
{ "bg", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F \u2013 \u0438\u0437\u0442\u043E\u0447\u043D\u043E \u0432\u0440\u0435\u043C\u0435", "Australia/Sydney" },
|
||||
|
|
@ -1258,30 +1249,30 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "bg", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\u0427\u0430\u0441\u043E\u0432\u0430 \u0437\u043E\u043D\u0430 \u0413\u0440\u0438\u043D\u0443\u0438\u0447", "+0:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"+0100", "+1:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_BG+"+0100", "+1:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_BG+"+1", "+1:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", GMT_BG+"+0100", "+1:00" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u041e\u0431\u0435\u0434\u0438\u043d\u0435\u043d\u043e \u043a\u0440\u0430\u043b\u0441\u0442\u0432\u043e \u0432\u0440\u0435\u043C\u0435", "Europe/London" },
|
||||
{ "bg", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u041e\u0431\u0435\u0434\u0438\u043d\u0435\u043d\u043e \u043a\u0440\u0430\u043b\u0441\u0442\u0432\u043e \u0432\u0440\u0435\u043C\u0435", "Europe/London" },
|
||||
|
||||
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", GMT_BG+"-0300", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", GMT_BG+"-3", "-3:00" },
|
||||
{ "bg", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", GMT_BG+"-0300", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", GMT_BG+"+0530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", GMT_BG+"+0530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", GMT_BG+"+530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\u0418\u043d\u0434\u0438\u0439\u0441\u043a\u043e \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", GMT_BG+"+0530", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", GMT_BG+"+0530", "+05:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", GMT_BG+"+530", "+05:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\u0418\u043d\u0434\u0438\u0439\u0441\u043a\u043e \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "+5:30" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\u0418\u043D\u0434\u0438\u044F \u0432\u0440\u0435\u043C\u0435", "Asia/Calcutta" },
|
||||
{ "bg", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\u0418\u043d\u0434\u0438\u0439\u0441\u043a\u043e \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435", "Asia/Calcutta" },
|
||||
|
|
@ -1290,13 +1281,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "V", "GMT-08:00", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "V", "GMT-07:00", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "America/Los_Angeles" },
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593", "America/Los_Angeles" },
|
||||
// icu ja.txt has exemplar city for this time zone
|
||||
{ "ja", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "\u30ED\u30B5\u30F3\u30BC\u30EB\u30B9\u6642\u9593", "America/Los_Angeles" },
|
||||
|
|
@ -1305,11 +1294,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6A19\u6E96\u6642", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6A19\u6E96\u6642", "-3:00" },
|
||||
// icu ja.txt does not have info for this time zone
|
||||
{ "ja", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u30D6\u30A8\u30CE\u30B9\u30A2\u30A4\u30EC\u30B9\u6642\u9593", "America/Buenos_Aires" },
|
||||
|
|
@ -1317,11 +1306,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6A19\u6E96\u6642", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6A19\u6E96\u6642", "-3:00" },
|
||||
// icu ja.txt does not have info for this time zone
|
||||
{ "ja", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u30D6\u30A8\u30CE\u30B9\u30A2\u30A4\u30EC\u30B9\u6642\u9593", "America/Buenos_Aires" },
|
||||
|
|
@ -1329,22 +1318,22 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
|
||||
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
|
||||
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
|
||||
{ "ja", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\u30AD\u30E5\u30FC\u30D0\u6A19\u6E96\u6642", "-5:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\u30AD\u30E5\u30FC\u30D0\u590F\u6642\u9593", "-4:00" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u30ad\u30e5\u30fc\u30d0\u6642\u9593", "America/Havana" },
|
||||
{ "ja", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u30ad\u30e5\u30fc\u30d0\u6642\u9593", "America/Havana" },
|
||||
|
||||
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "ja", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u6771\u90E8\u590F\u6642\u9593", "+11:00" },
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u6771\u90E8\u6A19\u6E96\u6642", "+10:00" },
|
||||
// icu ja.txt does not have info for this time zone
|
||||
{ "ja", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "\u30B7\u30C9\u30CB\u30FC\u6642\u9593", "Australia/Sydney" },
|
||||
|
|
@ -1352,11 +1341,11 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u6771\u90E8\u590F\u6642\u9593", "+11:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u6771\u90E8\u6A19\u6E96\u6642", "+10:00" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "\u30B7\u30C9\u30CB\u30FC\u6642\u9593", "Australia/Sydney" },
|
||||
{ "ja", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u6771\u90E8\u6642\u9593", "Australia/Sydney" },
|
||||
|
|
@ -1364,12 +1353,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
|
||||
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
|
||||
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
|
||||
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "V", "GMT", "+0:00" },
|
||||
{ "ja", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "\u30B0\u30EA\u30CB\u30C3\u30B8\u6A19\u6E96\u6642", "+0:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "V", "GMT+01:00", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "\u82f1\u56fd\u590f\u6642\u9593", "+1:00" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u30a4\u30ae\u30ea\u30b9\u6642\u9593", "Europe/London" },
|
||||
{ "ja", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u30a4\u30ae\u30ea\u30b9\u6642\u9593", "Europe/London" },
|
||||
|
|
@ -1377,23 +1364,23 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
|
||||
{ "ja", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "\u30A4\u30F3\u30C9\u6642\u9593", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "\u30A4\u30F3\u30C9\u6642\u9593", "+5:30" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\u30A4\u30F3\u30C9\u6642\u9593", "Asia/Calcutta" },
|
||||
{ "ja", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\u30A4\u30F3\u30C9\u6642\u9593", "Asia/Calcutta" },
|
||||
|
|
@ -1405,66 +1392,66 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-08:00", "-8:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "-8:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "GMT-08:00", "-8:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "-7:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "GMT-07:00", "-7:00" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles", "America/Los_Angeles" },
|
||||
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Los Angeles", "America/Los_Angeles" },
|
||||
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
|
||||
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
|
||||
|
||||
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
|
||||
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
|
||||
|
||||
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
|
||||
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
|
||||
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
|
||||
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
|
||||
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "GMT-05:00", "-5:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "GMT-04:00", "-4:00" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "CU", "America/Havana" },
|
||||
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "CU", "America/Havana" },
|
||||
|
||||
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
|
||||
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
|
||||
|
||||
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
|
||||
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
|
||||
|
|
@ -1475,30 +1462,30 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "GMT", "+0:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "GMT+01:00", "+1:00" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "v", "GB", "Europe/London" },
|
||||
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "GB", "Europe/London" },
|
||||
|
||||
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-03:00", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "v", "GMT-3", "-3:00" },
|
||||
{ "ti", "Etc/GMT+3", "2004-07-15T00:00:00Z", "vvvv", "GMT-03:00", "-3:00" },
|
||||
|
||||
// JB#5150
|
||||
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "IN", "Asia/Calcutta" },
|
||||
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "IN", "Asia/Calcutta" },
|
||||
|
|
@ -1516,8 +1503,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
{ "en_GB", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "CEST", "+2:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Standard Time", "+1:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "zzzz", "Central European Summer Time", "+2:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "GMT+01:00", "+1:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "GMT+02:00", "+2:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "GMT+1", "+1:00"},
|
||||
{ "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "GMT+2", "+2:00"},
|
||||
};
|
||||
/**
|
||||
* Verify that strings which contain incomplete specifications are parsed
|
||||
|
|
@ -2954,9 +2941,15 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
"HH:mm:ss vvvv", "10:20:30 UT+10:00", "10:20:30 +1000",
|
||||
"HH:mm:ss zzzz", "10:20:30 UTC", "10:20:30 +0000", // standalone "UTC"
|
||||
"ZZZZ HH:mm:ss", "UT 10:20:30", "10:20:30 +0000",
|
||||
"V HH:mm:ss", "UT+0130 10:20:30", "10:20:30 +0130",
|
||||
"V HH:mm:ss", "UTC+0130 10:20:30", "10:20:30 +0130",
|
||||
"HH mm Z ss", "10 20 GMT-1100 30", "10:20:30 -1100",
|
||||
"z HH:mm:ss", "UT+0130 10:20:30", "10:20:30 +0130",
|
||||
"z HH:mm:ss", "UTC+0130 10:20:30", "10:20:30 +0130",
|
||||
// Note: GMT-1100 no longer works because of the introduction of the short
|
||||
// localized GMT support. Previous implementation support this level of
|
||||
// leniency (no separator char in localized GMT format), but the new
|
||||
// implementation handles GMT-11 as the legitimate short localized GMT format
|
||||
// and stop at there. Otherwise, roundtrip would be broken.
|
||||
//"HH mm Z ss", "10 20 GMT-1100 30", "10:20:30 -1100",
|
||||
"HH mm Z ss", "10 20 GMT-11 30", "10:20:30 -1100",
|
||||
"HH:mm:ssZZZZZ", "14:25:45Z", "14:25:45 +0000",
|
||||
"HH:mm:ssZZZZZ", "15:00:00-08:00", "15:00:00 -0800",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -449,7 +449,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMM", "\\u5341\\u4E00\\u6708", // (fixed expected result per ticket 6872<-6626 and others)
|
||||
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 \\u4e0a\\u534810:10 GMT-0800 \\u2013 2007/11/20 \\u4e0a\\u534810:10 GMT-0800",
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 \\u4e0a\\u534810:10 GMT-8 \\u2013 2007/11/20 \\u4e0a\\u534810:10 GMT-8",
|
||||
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6",
|
||||
|
||||
|
|
@ -459,13 +459,13 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmv", "\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4\\u4E0A\\u534810:00\\u81F3\\u4E0B\\u53482:10",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "GMT-0800\\u4e0a\\u534810:00\\u81f3\\u4e0b\\u53482:10",
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "GMT-8\\u4e0a\\u534810:00\\u81f3\\u4e0b\\u53482:10",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "\\u4e0a\\u534810\\u65F6\\u81f3\\u4e0b\\u53482\\u65f6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hv", "\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4\\u4E0A\\u534810\\u65F6\\u81F3\\u4E0B\\u53482\\u65F6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hz", "GMT-0800\\u4e0a\\u534810\\u65F6\\u81f3\\u4e0b\\u53482\\u65f6",
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hz", "GMT-8\\u4e0a\\u534810\\u65F6\\u81f3\\u4e0b\\u53482\\u65f6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMM", "1\\u670810\\u65e5", // (fixed expected result per ticket 6872<-6626)
|
||||
|
||||
|
|
@ -475,7 +475,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "\\u4e0a\\u534810\\u65f6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "\\u4e0a\\u534810\\u65f6 GMT-0800",
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "\\u4e0a\\u534810\\u65f6 GMT-8",
|
||||
|
||||
"zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626)
|
||||
|
||||
|
|
@ -586,7 +586,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMM", "Mittwoch, 10. Jan.",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 vorm. - 2:10 nachm. GMT-08:00",
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 vorm. - 2:10 nachm. GMT-8",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 vorm. - 2 nachm.",
|
||||
|
||||
|
|
@ -596,13 +596,13 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "10:00-10:20 vorm. Los Angeles Zeit",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00-10:20 vorm. GMT-08:00",
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00-10:20 vorm. GMT-8",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "10 vorm.",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hv", "10 vorm. Los Angeles Zeit",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "10 vorm. GMT-08:00",
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "10 vorm. GMT-8",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007",
|
||||
|
||||
|
|
@ -614,15 +614,15 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "jmv", "10:10 Los Angeles Zeit",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 vorm. GMT-08:00",
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 vorm. GMT-8",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "jmz", "10:10 GMT-08:00",
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "jmz", "10:10 GMT-8",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "10 vorm.",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 vorm. Los Angeles Zeit",
|
||||
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. GMT-08:00",
|
||||
"de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. GMT-8",
|
||||
|
||||
// Thai (default calendar buddhist)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
********************************************************************************
|
||||
* Copyright (C) 2007-2012, Google, International Business Machines Corporation *
|
||||
* Copyright (C) 2007-2013, Google, International Business Machines Corporation *
|
||||
* and others. All Rights Reserved. *
|
||||
********************************************************************************
|
||||
*/
|
||||
|
|
@ -9,10 +9,14 @@ package com.ibm.icu.dev.test.format;
|
|||
|
||||
import java.text.ParseException;
|
||||
import java.text.ParsePosition;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import com.ibm.icu.impl.ZoneMeta;
|
||||
import com.ibm.icu.lang.UCharacter;
|
||||
import com.ibm.icu.text.SimpleDateFormat;
|
||||
import com.ibm.icu.text.TimeZoneFormat;
|
||||
|
|
@ -34,7 +38,30 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
new TimeZoneFormatTest().run(args);
|
||||
}
|
||||
|
||||
private static final String[] PATTERNS = {"z", "zzzz", "Z", "ZZZZ", "ZZZZZ", "v", "vvvv", "V", "VVVV"};
|
||||
private static final String[] PATTERNS = {
|
||||
"z",
|
||||
"zzzz",
|
||||
"Z", // equivalent to "xxxx"
|
||||
"ZZZZ", // equivalent to "OOOO"
|
||||
"v",
|
||||
"vvvv",
|
||||
"O",
|
||||
"OOOO",
|
||||
"X",
|
||||
"XX",
|
||||
"XXX",
|
||||
"XXXX",
|
||||
"XXXXX",
|
||||
"x",
|
||||
"xx",
|
||||
"xxx",
|
||||
"xxxx",
|
||||
"xxxxx",
|
||||
"V",
|
||||
"VV",
|
||||
"VVV",
|
||||
"VVVV"
|
||||
};
|
||||
boolean REALLY_VERBOSE_LOG = false;
|
||||
|
||||
/*
|
||||
|
|
@ -124,15 +151,43 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
tz.getOffset(DATES[datidx].getTime(), false, inOffsets);
|
||||
outtz.getOffset(DATES[datidx].getTime(), false, outOffsets);
|
||||
|
||||
if (PATTERNS[patidx].equals("VVVV")) {
|
||||
if (PATTERNS[patidx].equals("V")) {
|
||||
// Short zone ID - should support roundtrip for canonical CLDR IDs
|
||||
String canonicalID = TimeZone.getCanonicalID(tzids[tzidx]);
|
||||
if (!outtz.getID().equals(canonicalID)) {
|
||||
if (outtz.getID().equals("Etc/Unknown")) {
|
||||
// Note that some zones like Asia/Riyadh87 does not have
|
||||
// short zone ID and "unk" is used as the fallback
|
||||
if (REALLY_VERBOSE_LOG) {
|
||||
logln("Canonical round trip failed (probably as expected); tz=" + tzids[tzidx]
|
||||
+ ", locale=" + LOCALES[locidx] + ", pattern=" + PATTERNS[patidx]
|
||||
+ ", time=" + DATES[datidx].getTime() + ", str=" + tzstr
|
||||
+ ", outtz=" + outtz.getID());
|
||||
}
|
||||
} else {
|
||||
errln("Canonical round trip failed; tz=" + tzids[tzidx]
|
||||
+ ", locale=" + LOCALES[locidx] + ", pattern=" + PATTERNS[patidx]
|
||||
+ ", time=" + DATES[datidx].getTime() + ", str=" + tzstr
|
||||
+ ", outtz=" + outtz.getID());
|
||||
}
|
||||
}
|
||||
} else if (PATTERNS[patidx].equals("VV")) {
|
||||
// Zone ID - full roundtrip support
|
||||
if (!outtz.getID().equals(tzids[tzidx])) {
|
||||
errln("Zone ID round trip failed; tz=" + tzids[tzidx]
|
||||
+ ", locale=" + LOCALES[locidx] + ", pattern=" + PATTERNS[patidx]
|
||||
+ ", time=" + DATES[datidx].getTime() + ", str=" + tzstr
|
||||
+ ", outtz=" + outtz.getID());
|
||||
}
|
||||
} else if (PATTERNS[patidx].equals("VVV") || PATTERNS[patidx].equals("VVVV")) {
|
||||
// Location: time zone rule must be preserved except
|
||||
// zones not actually associated with a specific location.
|
||||
String canonicalID = TimeZone.getCanonicalID(tzids[tzidx]);
|
||||
boolean hasNoLocation = TimeZone.getRegion(tzids[tzidx]).equals("001");
|
||||
if (canonicalID != null && !outtz.getID().equals(canonicalID)) {
|
||||
// Canonical ID did not match - check the rules
|
||||
boolean bFailure = false;
|
||||
if ((tz instanceof BasicTimeZone) && (outtz instanceof BasicTimeZone)) {
|
||||
boolean hasNoLocation = TimeZone.getRegion(tzids[tzidx]).equals("001");
|
||||
bFailure = !hasNoLocation
|
||||
&& !((BasicTimeZone)outtz).hasEquivalentTransitions(tz, low, high);
|
||||
}
|
||||
|
|
@ -149,7 +204,14 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
boolean isOffsetFormat = (PATTERNS[patidx].charAt(0) == 'Z');
|
||||
boolean isOffsetFormat = (PATTERNS[patidx].charAt(0) == 'Z'
|
||||
|| PATTERNS[patidx].charAt(0) == 'O'
|
||||
|| PATTERNS[patidx].charAt(0) == 'X'
|
||||
|| PATTERNS[patidx].charAt(0) == 'x');
|
||||
boolean minutesOffset = false;
|
||||
if (PATTERNS[patidx].charAt(0) == 'X' || PATTERNS[patidx].charAt(0) == 'x') {
|
||||
minutesOffset = PATTERNS[patidx].length() <= 3;
|
||||
}
|
||||
|
||||
if (!isOffsetFormat) {
|
||||
// Check if localized GMT format is used as a fallback of name styles
|
||||
|
|
@ -159,14 +221,18 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
numDigits++;
|
||||
}
|
||||
}
|
||||
isOffsetFormat = (numDigits >= 3);
|
||||
isOffsetFormat = (numDigits > 0);
|
||||
}
|
||||
|
||||
if (isOffsetFormat || tzstr.equals(localGMTString)) {
|
||||
// Localized GMT or RFC: total offset (raw + dst) must be preserved.
|
||||
// Localized GMT or ISO: total offset (raw + dst) must be preserved.
|
||||
int inOffset = inOffsets[0] + inOffsets[1];
|
||||
int outOffset = outOffsets[0] + outOffsets[1];
|
||||
if (inOffset != outOffset) {
|
||||
int diff = outOffset - inOffset;
|
||||
if (minutesOffset) {
|
||||
diff = (diff / 60000) * 60000;
|
||||
}
|
||||
if (diff != 0) {
|
||||
errln("Offset round trip failed; tz=" + tzids[tzidx]
|
||||
+ ", locale=" + LOCALES[locidx] + ", pattern=" + PATTERNS[patidx]
|
||||
+ ", time=" + DATES[datidx].getTime() + ", str=" + tzstr
|
||||
|
|
@ -216,8 +282,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
if (TEST_ALL || getInclusion() > 5) {
|
||||
startYear = 1900;
|
||||
} else {
|
||||
// startYear = 1990;
|
||||
startYear = 1900;
|
||||
startYear = 1990;
|
||||
}
|
||||
|
||||
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
|
||||
|
|
@ -229,10 +294,17 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
cal.set(endYear, Calendar.JANUARY, 1);
|
||||
final long END_TIME = cal.getTimeInMillis();
|
||||
|
||||
// Whether each pattern is ambiguous at DST->STD local time overlap
|
||||
final boolean[] AMBIGUOUS_DST_DECESSION = {false, false, false, false, false, true, true, false, true};
|
||||
// Whether each pattern is ambiguous at STD->STD/DST->DST local time overlap
|
||||
final boolean[] AMBIGUOUS_NEGATIVE_SHIFT = {true, true, false, false, false, true, true, true, true};
|
||||
// These patterns are ambiguous at DST->STD local time overlap
|
||||
List<String> AMBIGUOUS_DST_DECESSION = Arrays.asList("v", "vvvv", "V", "VV", "VVV", "VVVV");
|
||||
|
||||
// These patterns are ambiguous at STD->STD/DST->DST local time overlap
|
||||
List<String> AMBIGUOUS_NEGATIVE_SHIFT = Arrays.asList("z", "zzzz", "v", "vvvv", "V", "VV", "VVV", "VVVV");
|
||||
|
||||
// These patterns only support integer minutes offset
|
||||
List<String> MINUTES_OFFSET = Arrays.asList("X", "XX", "XXX", "x", "xx", "xxx");
|
||||
|
||||
// Regex pattern used for filtering zone IDs without exemplar location
|
||||
final Pattern LOC_EXCLUSION_PATTERN = Pattern.compile("Etc/.*|SystemV/.*|.*/Riyadh8[7-9]");
|
||||
|
||||
final String BASEPATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
|
||||
|
||||
|
|
@ -259,8 +331,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
};
|
||||
} else {
|
||||
LOCALES = new ULocale[] {
|
||||
// new ULocale("en"),
|
||||
new ULocale("el"),
|
||||
new ULocale("en"),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -277,9 +348,27 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
logln(" pattern: " + PATTERNS[patidx]);
|
||||
String pattern = BASEPATTERN + " " + PATTERNS[patidx];
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(pattern, LOCALES[locidx]);
|
||||
boolean minutesOffset = MINUTES_OFFSET.contains(PATTERNS[patidx]);
|
||||
|
||||
Set<String> ids = TimeZone.getAvailableIDs(SystemTimeZoneType.CANONICAL, null, null);
|
||||
for (String id : ids) {
|
||||
if (PATTERNS[patidx].equals("V")) {
|
||||
// Some zones do not have short ID assigned, such as Asia/Riyadh87.
|
||||
// The time roundtrip will fail for such zones with pattern "V" (short zone ID).
|
||||
// This is expected behavior.
|
||||
String shortZoneID = ZoneMeta.getShortID(id);
|
||||
if (shortZoneID == null) {
|
||||
continue;
|
||||
}
|
||||
} else if (PATTERNS[patidx].equals("VVV")) {
|
||||
// Some zones are not associated with any region, such as Etc/GMT+8.
|
||||
// The time roundtrip will fail for such zones with pattern "VVV" (exemplar location).
|
||||
// This is expected behavior.
|
||||
if (id.indexOf('/') < 0 || LOC_EXCLUSION_PATTERN.matcher(id).matches()) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
BasicTimeZone btz = (BasicTimeZone)TimeZone.getTimeZone(id, TimeZone.TIMEZONE_ICU);
|
||||
TimeZone tz = TimeZone.getTimeZone(id);
|
||||
sdf.setTimeZone(tz);
|
||||
|
|
@ -302,10 +391,12 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
expectedRoundTrip[0] = true;
|
||||
testTimes[1] = t + delta;
|
||||
expectedRoundTrip[1] = isDstDecession ?
|
||||
!AMBIGUOUS_DST_DECESSION[patidx] : !AMBIGUOUS_NEGATIVE_SHIFT[patidx];
|
||||
!AMBIGUOUS_DST_DECESSION.contains(PATTERNS[patidx]) :
|
||||
!AMBIGUOUS_NEGATIVE_SHIFT.contains(PATTERNS[patidx]);
|
||||
testTimes[2] = t - 1;
|
||||
expectedRoundTrip[2] = isDstDecession ?
|
||||
!AMBIGUOUS_DST_DECESSION[patidx] : !AMBIGUOUS_NEGATIVE_SHIFT[patidx];
|
||||
!AMBIGUOUS_DST_DECESSION.contains(PATTERNS[patidx]) :
|
||||
!AMBIGUOUS_NEGATIVE_SHIFT.contains(PATTERNS[patidx]);
|
||||
testTimes[3] = t;
|
||||
expectedRoundTrip[3] = true;
|
||||
testLen = 4;
|
||||
|
|
@ -324,7 +415,10 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
try {
|
||||
Date parsedDate = sdf.parse(text);
|
||||
long restime = parsedDate.getTime();
|
||||
if (restime != testTimes[testidx]) {
|
||||
long timeDiff = restime - testTimes[testidx];
|
||||
boolean bTimeMatch = minutesOffset ?
|
||||
(timeDiff/60000)*60000 == 0 : timeDiff == 0;
|
||||
if (!bTimeMatch) {
|
||||
StringBuffer msg = new StringBuffer();
|
||||
msg.append("Time round trip failed for ")
|
||||
.append("tzid=").append(id)
|
||||
|
|
@ -334,7 +428,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
.append(", gmt=").append(sdfGMT.format(new Date(testTimes[testidx])))
|
||||
.append(", time=").append(testTimes[testidx])
|
||||
.append(", restime=").append(restime)
|
||||
.append(", diff=").append(restime - testTimes[testidx]);
|
||||
.append(", diff=").append(timeDiff);
|
||||
if (expectedRoundTrip[testidx]) {
|
||||
errln("FAIL: " + msg.toString());
|
||||
} else if (REALLY_VERBOSE_LOG) {
|
||||
|
|
@ -342,7 +436,8 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
}
|
||||
}
|
||||
} catch (ParseException pe) {
|
||||
errln("FAIL: " + pe.getMessage());
|
||||
errln("FAIL: " + pe.getMessage() + " tzid=" + id + ", locale=" + LOCALES[locidx] +
|
||||
", pattern=" + PATTERNS[patidx] + ", text=" + text);
|
||||
}
|
||||
times[patidx] += System.currentTimeMillis() - timer;
|
||||
}
|
||||
|
|
@ -375,25 +470,25 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
public void TestParse() {
|
||||
final Object[][] DATA = {
|
||||
// text inpos locale style parseAll? expected outpos time type
|
||||
{"Z", 0, "en_US", Style.ISO8601, false, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Z", 0, "en_US", Style.SPECIFIC_LONG, false, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.ISO8601, true, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.GENERIC_LOCATION, false, "Africa/Lusaka", 11, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.RFC822, true, "Africa/Lusaka", 11, TimeType.UNKNOWN},
|
||||
{"+00:00", 0, "en_US", Style.ISO8601, false, "Etc/GMT", 6, TimeType.UNKNOWN},
|
||||
{"-01:30:45", 0, "en_US", Style.ISO8601, false, "GMT-01:30:45", 9, TimeType.UNKNOWN},
|
||||
{"-7", 0, "en_US", Style.RFC822, false, "GMT-07:00", 2, TimeType.UNKNOWN},
|
||||
{"-2222", 0, "en_US", Style.RFC822, false, "GMT-22:22", 5, TimeType.UNKNOWN},
|
||||
{"-3333", 0, "en_US", Style.RFC822, false, "GMT-03:33", 4, TimeType.UNKNOWN},
|
||||
{"XXX+01:30YYY", 3, "en_US", Style.LOCALIZED_GMT, false, "GMT+01:30", 9, TimeType.UNKNOWN},
|
||||
{"GMT0", 0, "en_US", Style.SPECIFIC_SHORT, false, "Etc/GMT", 3, TimeType.UNKNOWN},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"ESTx", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"EDTx", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.DAYLIGHT},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_LONG, false, "", 0, TimeType.UNKNOWN},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_LONG, true, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"EST", 0, "en_CA", Style.SPECIFIC_SHORT, false, "America/Toronto", 3, TimeType.STANDARD},
|
||||
// text inpos locale style parseAll? expected outpos time type
|
||||
{"Z", 0, "en_US", Style.ISO_EXTENDED_FULL, false, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Z", 0, "en_US", Style.SPECIFIC_LONG, false, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.ISO_EXTENDED_FULL, true, "Etc/GMT", 1, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.GENERIC_LOCATION, false, "Africa/Lusaka", 11, TimeType.UNKNOWN},
|
||||
{"Zambia time", 0, "en_US", Style.ISO_BASIC_LOCAL_FULL, true, "Africa/Lusaka", 11, TimeType.UNKNOWN},
|
||||
{"+00:00", 0, "en_US", Style.ISO_EXTENDED_FULL, false, "Etc/GMT", 6, TimeType.UNKNOWN},
|
||||
{"-01:30:45", 0, "en_US", Style.ISO_EXTENDED_FULL, false, "GMT-01:30:45", 9, TimeType.UNKNOWN},
|
||||
{"-7", 0, "en_US", Style.ISO_BASIC_LOCAL_FULL, false, "GMT-07:00", 2, TimeType.UNKNOWN},
|
||||
{"-2222", 0, "en_US", Style.ISO_BASIC_LOCAL_FULL, false, "GMT-22:22", 5, TimeType.UNKNOWN},
|
||||
{"-3333", 0, "en_US", Style.ISO_BASIC_LOCAL_FULL, false, "GMT-03:33", 4, TimeType.UNKNOWN},
|
||||
{"XXX+01:30YYY", 3, "en_US", Style.LOCALIZED_GMT, false, "GMT+01:30", 9, TimeType.UNKNOWN},
|
||||
{"GMT0", 0, "en_US", Style.SPECIFIC_SHORT, false, "Etc/GMT", 3, TimeType.UNKNOWN},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"ESTx", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"EDTx", 0, "en_US", Style.SPECIFIC_SHORT, false, "America/New_York", 3, TimeType.DAYLIGHT},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_LONG, false, null, 0, TimeType.UNKNOWN},
|
||||
{"EST", 0, "en_US", Style.SPECIFIC_LONG, true, "America/New_York", 3, TimeType.STANDARD},
|
||||
{"EST", 0, "en_CA", Style.SPECIFIC_SHORT, false, "America/Toronto", 3, TimeType.STANDARD},
|
||||
};
|
||||
|
||||
for (Object[] test : DATA) {
|
||||
|
|
@ -413,7 +508,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
|
||||
String errMsg = null;
|
||||
if (tz == null) {
|
||||
if (expID.length() != 0) {
|
||||
if (expID != null) {
|
||||
errMsg = "Parse failure - expected: " + expID;
|
||||
}
|
||||
} else if (!tz.getID().equals(expID)) {
|
||||
|
|
@ -429,4 +524,152 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void TestISOFormat() {
|
||||
final int[] OFFSET = {
|
||||
0, // 0
|
||||
999, // 0.999s
|
||||
-59999, // -59.999s
|
||||
60000, // 1m
|
||||
-77777, // -1m 17.777s
|
||||
1800000, // 30m
|
||||
-3600000, // -1h
|
||||
36000000, // 10h
|
||||
-37800000, // -10h 30m
|
||||
-37845000, // -10h 30m 45s
|
||||
108000000, // 30h
|
||||
};
|
||||
|
||||
final String[][] ISO_STR = {
|
||||
// 0
|
||||
{
|
||||
"Z", "Z", "Z", "Z", "Z",
|
||||
"+00", "+0000", "+00:00", "+0000", "+00:00",
|
||||
"+0000"
|
||||
},
|
||||
// 999
|
||||
{
|
||||
"Z", "Z", "Z", "Z", "Z",
|
||||
"+00", "+0000", "+00:00", "+0000", "+00:00",
|
||||
"+0000"
|
||||
},
|
||||
// -59999
|
||||
{
|
||||
"Z", "Z", "Z", "-000059", "-00:00:59",
|
||||
"+00", "+0000", "+00:00", "-000059", "-00:00:59",
|
||||
"-000059"
|
||||
},
|
||||
// 60000
|
||||
{
|
||||
"+0001", "+0001", "+00:01", "+0001", "+00:01",
|
||||
"+0001", "+0001", "+00:01", "+0001", "+00:01",
|
||||
"+0001"
|
||||
},
|
||||
// -77777
|
||||
{
|
||||
"-0001", "-0001", "-00:01", "-000117", "-00:01:17",
|
||||
"-0001", "-0001", "-00:01", "-000117", "-00:01:17",
|
||||
"-000117"
|
||||
},
|
||||
// 1800000
|
||||
{
|
||||
"+0030", "+0030", "+00:30", "+0030", "+00:30",
|
||||
"+0030", "+0030", "+00:30", "+0030", "+00:30",
|
||||
"+0030"
|
||||
},
|
||||
// -3600000
|
||||
{
|
||||
"-01", "-0100", "-01:00", "-0100", "-01:00",
|
||||
"-01", "-0100", "-01:00", "-0100", "-01:00",
|
||||
"-0100"
|
||||
},
|
||||
// 36000000
|
||||
{
|
||||
"+10", "+1000", "+10:00", "+1000", "+10:00",
|
||||
"+10", "+1000", "+10:00", "+1000", "+10:00",
|
||||
"+1000"
|
||||
},
|
||||
// -37800000
|
||||
{
|
||||
"-1030", "-1030", "-10:30", "-1030", "-10:30",
|
||||
"-1030", "-1030", "-10:30", "-1030", "-10:30",
|
||||
"-1030"
|
||||
},
|
||||
// -37845000
|
||||
{
|
||||
"-1030", "-1030", "-10:30", "-103045", "-10:30:45",
|
||||
"-1030", "-1030", "-10:30", "-103045", "-10:30:45",
|
||||
"-103045"
|
||||
},
|
||||
// 108000000
|
||||
{
|
||||
null, null, null, null, null,
|
||||
null, null, null, null, null,
|
||||
null
|
||||
}
|
||||
};
|
||||
|
||||
final String[] PATTERN = {
|
||||
"X", "XX", "XXX", "XXXX", "XXXXX", "x", "xx", "xxx", "xxxx", "xxxxx",
|
||||
"Z", // equivalent to "xxxx"
|
||||
};
|
||||
|
||||
final int[] MIN_OFFSET_UNIT = {
|
||||
60000, 60000, 60000, 1000, 1000, 60000, 60000, 60000, 1000, 1000,
|
||||
1000,
|
||||
};
|
||||
|
||||
// Formatting
|
||||
SimpleDateFormat sdf = new SimpleDateFormat();
|
||||
Date d = new Date();
|
||||
|
||||
for (int i = 0; i < OFFSET.length; i++) {
|
||||
SimpleTimeZone tz = new SimpleTimeZone(OFFSET[i], "Zone Offset:" + String.valueOf(OFFSET[i]) + "ms");
|
||||
sdf.setTimeZone(tz);
|
||||
for (int j = 0; j < PATTERN.length; j++) {
|
||||
sdf.applyPattern(PATTERN[j]);
|
||||
try {
|
||||
String result = sdf.format(d);
|
||||
if (!result.equals(ISO_STR[i][j])) {
|
||||
errln("FAIL: pattern=" + PATTERN[j] + ", offset=" + OFFSET[i] + " -> "
|
||||
+ result + " (expected: " + ISO_STR[i][j] + ")");
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
if (ISO_STR[i][j] != null) {
|
||||
errln("FAIL: IAE thrown for pattern=" + PATTERN[j] + ", offset=" + OFFSET[i]
|
||||
+ " (expected: " + ISO_STR[i][j] + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Parsing
|
||||
SimpleTimeZone bogusTZ = new SimpleTimeZone(-1, "Zone Offset: -1ms");
|
||||
for (int i = 0; i < ISO_STR.length; i++) {
|
||||
for (int j = 0; j < ISO_STR[i].length; j++) {
|
||||
if (ISO_STR[i][j] == null) {
|
||||
continue;
|
||||
}
|
||||
ParsePosition pos = new ParsePosition(0);
|
||||
Calendar outcal = Calendar.getInstance(bogusTZ);
|
||||
sdf.applyPattern(PATTERN[j]);
|
||||
|
||||
sdf.parse(ISO_STR[i][j], outcal, pos);
|
||||
|
||||
if (pos.getIndex() != ISO_STR[i][j].length()) {
|
||||
errln("FAIL: Failed to parse the entire input string: " + ISO_STR[i][j]);
|
||||
continue;
|
||||
}
|
||||
|
||||
TimeZone outtz = outcal.getTimeZone();
|
||||
int outOffset = outtz.getRawOffset();
|
||||
int adjustedOffset = OFFSET[i] / MIN_OFFSET_UNIT[j] * MIN_OFFSET_UNIT[j];
|
||||
|
||||
if (outOffset != adjustedOffset) {
|
||||
errln("FAIL: Incorrect offset:" + outOffset + "ms for input string: " + ISO_STR[i][j]
|
||||
+ " (expected:" + adjustedOffset + "ms)");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2000-2010, International Business Machines Corporation and *
|
||||
* Copyright (C) 2000-2013, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
|
@ -854,25 +854,25 @@ public class TimeZoneRegression extends TestFmwk {
|
|||
// Description, Result, Expected Result
|
||||
String[] DATA = {
|
||||
"getDisplayName(false, SHORT)/std zone",
|
||||
z1.getDisplayName(false, TimeZone.SHORT), "GMT+01:30",
|
||||
z1.getDisplayName(false, TimeZone.SHORT), "GMT+1:30",
|
||||
"getDisplayName(false, LONG)/std zone",
|
||||
z1.getDisplayName(false, TimeZone.LONG ), "GMT+01:30",
|
||||
"getDisplayName(true, SHORT)/std zone",
|
||||
z1.getDisplayName(true, TimeZone.SHORT), "GMT+01:30",
|
||||
z1.getDisplayName(true, TimeZone.SHORT), "GMT+1:30",
|
||||
"getDisplayName(true, LONG)/std zone",
|
||||
z1.getDisplayName(true, TimeZone.LONG ), "GMT+01:30",
|
||||
"getDisplayName(false, SHORT)/dst zone",
|
||||
z2.getDisplayName(false, TimeZone.SHORT), "GMT+01:30",
|
||||
z2.getDisplayName(false, TimeZone.SHORT), "GMT+1:30",
|
||||
"getDisplayName(false, LONG)/dst zone",
|
||||
z2.getDisplayName(false, TimeZone.LONG ), "GMT+01:30",
|
||||
"getDisplayName(true, SHORT)/dst zone",
|
||||
z2.getDisplayName(true, TimeZone.SHORT), "GMT+02:15",
|
||||
z2.getDisplayName(true, TimeZone.SHORT), "GMT+2:15",
|
||||
"getDisplayName(true, LONG)/dst zone",
|
||||
z2.getDisplayName(true, TimeZone.LONG ), "GMT+02:15",
|
||||
"DateFormat.format(std)/std zone", fmt1.format(std), "GMT+01:30",
|
||||
"DateFormat.format(dst)/std zone", fmt1.format(dst), "GMT+01:30",
|
||||
"DateFormat.format(std)/dst zone", fmt2.format(std), "GMT+01:30",
|
||||
"DateFormat.format(dst)/dst zone", fmt2.format(dst), "GMT+02:15",
|
||||
"DateFormat.format(std)/std zone", fmt1.format(std), "GMT+1:30",
|
||||
"DateFormat.format(dst)/std zone", fmt1.format(dst), "GMT+1:30",
|
||||
"DateFormat.format(std)/dst zone", fmt2.format(std), "GMT+1:30",
|
||||
"DateFormat.format(dst)/dst zone", fmt2.format(dst), "GMT+2:15",
|
||||
};
|
||||
|
||||
for (int i=0; i<DATA.length; i+=3) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2000-2012, International Business Machines Corporation and *
|
||||
* Copyright (C) 2000-2013, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
|
@ -1666,7 +1666,7 @@ public class TimeZoneTest extends TestFmwk
|
|||
// zone id locale summer format expected display name
|
||||
{"Europe/London", "en", Boolean.FALSE, TZSHORT, "GMT"},
|
||||
{"Europe/London", "en", Boolean.FALSE, TZLONG, "Greenwich Mean Time"},
|
||||
{"Europe/London", "en", Boolean.TRUE, TZSHORT, "GMT+01:00" /*"BST"*/},
|
||||
{"Europe/London", "en", Boolean.TRUE, TZSHORT, "GMT+1" /*"BST"*/},
|
||||
{"Europe/London", "en", Boolean.TRUE, TZLONG, "British Summer Time"},
|
||||
|
||||
{"America/Anchorage", "en", Boolean.FALSE, TZSHORT, "AKST"},
|
||||
|
|
@ -1675,17 +1675,17 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"America/Anchorage", "en", Boolean.TRUE, TZLONG, "Alaska Daylight Time"},
|
||||
|
||||
// Southern Hemisphere, all data from meta:Australia_Western
|
||||
{"Australia/Perth", "en", Boolean.FALSE, TZSHORT, "GMT+08:00"/*"AWST"*/},
|
||||
{"Australia/Perth", "en", Boolean.FALSE, TZSHORT, "GMT+8"/*"AWST"*/},
|
||||
{"Australia/Perth", "en", Boolean.FALSE, TZLONG, "Australian Western Standard Time"},
|
||||
// Note: Perth does not observe DST currently. When display name is missing,
|
||||
// the localized GMT format with the current offset is used even daylight name was
|
||||
// requested. See #9350.
|
||||
{"Australia/Perth", "en", Boolean.TRUE, TZSHORT, "GMT+08:00"/*"AWDT"*/},
|
||||
{"Australia/Perth", "en", Boolean.TRUE, TZSHORT, "GMT+8"/*"AWDT"*/},
|
||||
{"Australia/Perth", "en", Boolean.TRUE, TZLONG, "Australian Western Daylight Time"},
|
||||
|
||||
{"America/Sao_Paulo", "en", Boolean.FALSE, TZSHORT, "GMT-03:00"/*"BRT"*/},
|
||||
{"America/Sao_Paulo", "en", Boolean.FALSE, TZSHORT, "GMT-3"/*"BRT"*/},
|
||||
{"America/Sao_Paulo", "en", Boolean.FALSE, TZLONG, "Brasilia Standard Time"},
|
||||
{"America/Sao_Paulo", "en", Boolean.TRUE, TZSHORT, "GMT-02:00"/*"BRST"*/},
|
||||
{"America/Sao_Paulo", "en", Boolean.TRUE, TZSHORT, "GMT-2"/*"BRST"*/},
|
||||
{"America/Sao_Paulo", "en", Boolean.TRUE, TZLONG, "Brasilia Summer Time"},
|
||||
|
||||
// No Summer Time, but had it before 1983.
|
||||
|
|
@ -1695,14 +1695,14 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"Pacific/Honolulu", "en", Boolean.TRUE, TZLONG, "Hawaii-Aleutian Daylight Time"},
|
||||
|
||||
// Northern, has Summer, not commonly used.
|
||||
{"Europe/Helsinki", "en", Boolean.FALSE, TZSHORT, "GMT+02:00"/*"EET"*/},
|
||||
{"Europe/Helsinki", "en", Boolean.FALSE, TZSHORT, "GMT+2"/*"EET"*/},
|
||||
{"Europe/Helsinki", "en", Boolean.FALSE, TZLONG, "Eastern European Standard Time"},
|
||||
{"Europe/Helsinki", "en", Boolean.TRUE, TZSHORT, "GMT+03:00"/*"EEST"*/},
|
||||
{"Europe/Helsinki", "en", Boolean.TRUE, TZSHORT, "GMT+3"/*"EEST"*/},
|
||||
{"Europe/Helsinki", "en", Boolean.TRUE, TZLONG, "Eastern European Summer Time"},
|
||||
|
||||
// Repeating the test data for DST. The test data below trigger the problem reported
|
||||
// by Ticket#6644
|
||||
{"Europe/London", "en", Boolean.TRUE, TZSHORT, "GMT+01:00" /*"BST"*/},
|
||||
{"Europe/London", "en", Boolean.TRUE, TZSHORT, "GMT+1" /*"BST"*/},
|
||||
{"Europe/London", "en", Boolean.TRUE, TZLONG, "British Summer Time"},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue