diff --git a/icu4c/source/i18n/dtitvfmt.cpp b/icu4c/source/i18n/dtitvfmt.cpp index b7d476a4267..b2131db77ac 100644 --- a/icu4c/source/i18n/dtitvfmt.cpp +++ b/icu4c/source/i18n/dtitvfmt.cpp @@ -3,7 +3,7 @@ * others. All Rights Reserved. ******************************************************************************* * -* File DTITVFMT.CPP +* File DTITVFMT.CPP * ******************************************************************************* */ @@ -27,7 +27,7 @@ #include "gregoimp.h" #include "mutex.h" -#ifdef DTITVFMT_DEBUG +#ifdef DTITVFMT_DEBUG #include #endif @@ -35,7 +35,7 @@ U_NAMESPACE_BEGIN -#ifdef DTITVFMT_DEBUG +#ifdef DTITVFMT_DEBUG #define PRINTMESG(msg) { std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; } #endif @@ -63,21 +63,21 @@ static const UChar gEarlierFirstPrefix[] = {LOW_E, LOW_A, LOW_R, LOW_L, LOW_I, L UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateIntervalFormat) -// Mutex, protects access to fDateFormat, fFromCalendar and fToCalendar. +// Mutex, protects access to fDateFormat, fFromCalendar and fToCalendar. // Needed because these data members are modified by const methods of DateIntervalFormat. static UMutex gFormatterMutex = U_MUTEX_INITIALIZER; DateIntervalFormat* U_EXPORT2 -DateIntervalFormat::createInstance(const UnicodeString& skeleton, +DateIntervalFormat::createInstance(const UnicodeString& skeleton, UErrorCode& status) { return createInstance(skeleton, Locale::getDefault(), status); } DateIntervalFormat* U_EXPORT2 -DateIntervalFormat::createInstance(const UnicodeString& skeleton, - const Locale& locale, +DateIntervalFormat::createInstance(const UnicodeString& skeleton, + const Locale& locale, UErrorCode& status) { #ifdef DTITVFMT_DEBUG char result[1000]; @@ -217,15 +217,9 @@ DateIntervalFormat::operator==(const Format& other) const { Mutex lock(&gFormatterMutex); if (fDateFormat != fmt->fDateFormat && (fDateFormat == NULL || fmt->fDateFormat == NULL)) {return FALSE;} if (fDateFormat && fmt->fDateFormat && (*fDateFormat != *fmt->fDateFormat)) {return FALSE;} - - // TODO: should operator == ignore the From and ToCalendar? They hold transient values during - // formatting of a DateInterval. - if (fFromCalendar != fmt->fFromCalendar && (fFromCalendar == NULL || fmt->fFromCalendar == NULL)) {return FALSE;} - if (fFromCalendar && fmt->fFromCalendar && !fFromCalendar->isEquivalentTo(*fmt->fFromCalendar)) {return FALSE;} - - if (fToCalendar != fmt->fToCalendar && (fToCalendar == NULL || fmt->fToCalendar == NULL)) {return FALSE;} - if (fToCalendar && fmt->fToCalendar && !fToCalendar->isEquivalentTo(*fmt->fToCalendar)) {return FALSE;} } + // note: fFromCalendar and fToCalendar hold no persistent state, and therefore do not participate in operator ==. + // fDateFormat has the master calendar for the DateIntervalFormat. if (fSkeleton != fmt->fSkeleton) {return FALSE;} if (fDatePattern != fmt->fDatePattern && (fDatePattern == NULL || fmt->fDatePattern == NULL)) {return FALSE;} if (fDatePattern && fmt->fDatePattern && (*fDatePattern != *fmt->fDatePattern)) {return FALSE;} @@ -294,7 +288,7 @@ DateIntervalFormat::format(Calendar& fromCalendar, Mutex lock(&gFormatterMutex); return formatImpl(fromCalendar, toCalendar, appendTo, pos, status); } - + UnicodeString& DateIntervalFormat::formatImpl(Calendar& fromCalendar, @@ -318,7 +312,7 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, if ( fromCalendar.get(UCAL_ERA,status) != toCalendar.get(UCAL_ERA,status)) { field = UCAL_ERA; - } else if ( fromCalendar.get(UCAL_YEAR, status) != + } else if ( fromCalendar.get(UCAL_YEAR, status) != toCalendar.get(UCAL_YEAR, status) ) { field = UCAL_YEAR; } else if ( fromCalendar.get(UCAL_MONTH, status) != @@ -351,7 +345,7 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, return fDateFormat->format(fromCalendar, appendTo, pos); } UBool fromToOnSameDay = (field==UCAL_AM_PM || field==UCAL_HOUR || field==UCAL_MINUTE || field==UCAL_SECOND); - + // following call should not set wrong status, // all the pass-in fields are valid till here int32_t itvPtnIndex = DateIntervalInfo::calendarFieldToIntervalIndex(field, @@ -369,7 +363,7 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, } return fallbackFormat(fromCalendar, toCalendar, fromToOnSameDay, appendTo, pos, status); } - // If the first part in interval pattern is empty, + // If the first part in interval pattern is empty, // the 2nd part of it saves the full-pattern used in fall-back. // For a 'real' interval pattern, the first part will never be empty. if ( intervalPattern.firstPart.isEmpty() ) { @@ -391,7 +385,7 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, secondCal = &toCalendar; } // break the interval pattern into 2 parts, - // first part should not be empty, + // first part should not be empty, UnicodeString originalPattern; fDateFormat->toPattern(originalPattern); fDateFormat->applyPattern(intervalPattern.firstPart); @@ -412,11 +406,11 @@ DateIntervalFormat::formatImpl(Calendar& fromCalendar, void -DateIntervalFormat::parseObject(const UnicodeString& /* source */, +DateIntervalFormat::parseObject(const UnicodeString& /* source */, Formattable& /* result */, ParsePosition& /* parse_pos */) const { // parseObject(const UnicodeString&, Formattable&, UErrorCode&) const - // will set status as U_INVALID_FORMAT_ERROR if + // will set status as U_INVALID_FORMAT_ERROR if // parse_pos is still 0 } @@ -449,7 +443,7 @@ DateIntervalFormat::setDateIntervalInfo(const DateIntervalInfo& newItvPattern, } - + const DateFormat* DateIntervalFormat::getDateFormat() const { return fDateFormat; @@ -504,7 +498,7 @@ DateIntervalFormat::getTimeZone() const DateIntervalFormat::DateIntervalFormat(const Locale& locale, DateIntervalInfo* dtItvInfo, const UnicodeString* skeleton, - UErrorCode& status) + UErrorCode& status) : fInfo(NULL), fDateFormat(NULL), fFromCalendar(NULL), @@ -538,7 +532,7 @@ DateIntervalFormat::create(const Locale& locale, DateIntervalInfo* dtitvinf, const UnicodeString* skeleton, UErrorCode& status) { - DateIntervalFormat* f = new DateIntervalFormat(locale, dtitvinf, + DateIntervalFormat* f = new DateIntervalFormat(locale, dtitvinf, skeleton, status); if ( f == NULL ) { status = U_MEMORY_ALLOCATION_ERROR; @@ -553,10 +547,10 @@ DateIntervalFormat::create(const Locale& locale, -/** +/** * Initialize interval patterns locale to this formatter - * - * This code is a bit complicated since + * + * This code is a bit complicated since * 1. the interval patterns saved in resource bundle files are interval * patterns based on date or time only. * It does not have interval patterns based on both date and time. @@ -564,30 +558,30 @@ DateIntervalFormat::create(const Locale& locale, * * For example, it has interval patterns on skeleton "dMy" and "hm", * but it does not have interval patterns on skeleton "dMyhm". - * - * The rule to genearte interval patterns for both date and time skeleton are - * 1) when the year, month, or day differs, concatenate the two original - * expressions with a separator between, - * For example, interval pattern from "Jan 10, 2007 10:10 am" - * to "Jan 11, 2007 10:10am" is - * "Jan 10, 2007 10:10 am - Jan 11, 2007 10:10am" * - * 2) otherwise, present the date followed by the range expression + * The rule to genearte interval patterns for both date and time skeleton are + * 1) when the year, month, or day differs, concatenate the two original + * expressions with a separator between, + * For example, interval pattern from "Jan 10, 2007 10:10 am" + * to "Jan 11, 2007 10:10am" is + * "Jan 10, 2007 10:10 am - Jan 11, 2007 10:10am" + * + * 2) otherwise, present the date followed by the range expression * for the time. - * For example, interval pattern from "Jan 10, 2007 10:10 am" - * to "Jan 10, 2007 11:10am" is - * "Jan 10, 2007 10:10 am - 11:10am" + * For example, interval pattern from "Jan 10, 2007 10:10 am" + * to "Jan 10, 2007 11:10am" is + * "Jan 10, 2007 10:10 am - 11:10am" * * 2. even a pattern does not request a certion calendar field, * the interval pattern needs to include such field if such fields are * different between 2 dates. - * For example, a pattern/skeleton is "hm", but the interval pattern + * For example, a pattern/skeleton is "hm", but the interval pattern * includes year, month, and date when year, month, and date differs. - * + * * @param status output param set to success/failure code on exit - * @stable ICU 4.0 + * @stable ICU 4.0 */ -void +void DateIntervalFormat::initializePattern(UErrorCode& status) { if ( U_FAILURE(status) ) { return; @@ -609,7 +603,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { fSkeleton = DateTimePatternGenerator::staticGetSkeleton( fullPattern, status); if ( U_FAILURE(status) ) { - return; + return; } } @@ -631,7 +625,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { /* the difference between time skeleton and normalizedTimeSkeleton are: * 1. (Formerly, normalized time skeleton folded 'H' to 'h'; no longer true) * 2. 'a' is omitted in normalized time skeleton. - * 3. there is only one appearance for 'h' or 'H', 'm','v', 'z' in normalized + * 3. there is only one appearance for 'h' or 'H', 'm','v', 'z' in normalized * time skeleton * * The difference between date skeleton and normalizedDateSkeleton are: @@ -666,7 +660,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { status = U_MEMORY_ALLOCATION_ERROR; return; } - + const UResourceBundle* dateTimePatternsRes = calData->getByKey( gDateTimePatternsTag, status); int32_t dateTimeFormatLength; @@ -680,7 +674,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { delete calData; } - UBool found = setSeparateDateTimePtn(normalizedDateSkeleton, + UBool found = setSeparateDateTimePtn(normalizedDateSkeleton, normalizedTimeSkeleton); // for skeletons with seconds, found is false and we enter this block @@ -694,15 +688,15 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { UnicodeString pattern = DateFormat::getBestPattern( locale, timeSkeleton, status); if ( U_FAILURE(status) ) { - return; + return; } // for fall back interval patterns, // the first part of the pattern is empty, // the second part of the pattern is the full-pattern // should be used in fall-back. - setPatternInfo(UCAL_DATE, NULL, &pattern, fInfo->getDefaultOrder()); - setPatternInfo(UCAL_MONTH, NULL, &pattern, fInfo->getDefaultOrder()); - setPatternInfo(UCAL_YEAR, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_DATE, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_MONTH, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_YEAR, NULL, &pattern, fInfo->getDefaultOrder()); } else { // TODO: fall back } @@ -711,7 +705,7 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { } return; } // end of skeleton not found - // interval patterns for skeleton are found in resource + // interval patterns for skeleton are found in resource if ( timeSkeleton.length() == 0 ) { // done } else if ( dateSkeleton.length() == 0 ) { @@ -720,25 +714,25 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { UnicodeString pattern = DateFormat::getBestPattern( locale, timeSkeleton, status); if ( U_FAILURE(status) ) { - return; + return; } // for fall back interval patterns, // the first part of the pattern is empty, // the second part of the pattern is the full-pattern // should be used in fall-back. - setPatternInfo(UCAL_DATE, NULL, &pattern, fInfo->getDefaultOrder()); - setPatternInfo(UCAL_MONTH, NULL, &pattern, fInfo->getDefaultOrder()); - setPatternInfo(UCAL_YEAR, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_DATE, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_MONTH, NULL, &pattern, fInfo->getDefaultOrder()); + setPatternInfo(UCAL_YEAR, NULL, &pattern, fInfo->getDefaultOrder()); } else { /* if both present, - * 1) when the year, month, or day differs, - * concatenate the two original expressions with a separator between, - * 2) otherwise, present the date followed by the - * range expression for the time. + * 1) when the year, month, or day differs, + * concatenate the two original expressions with a separator between, + * 2) otherwise, present the date followed by the + * range expression for the time. */ /* - * 1) when the year, month, or day differs, - * concatenate the two original expressions with a separator between, + * 1) when the year, month, or day differs, + * concatenate the two original expressions with a separator between, */ // if field exists, use fall back UnicodeString skeleton = fSkeleton; @@ -757,10 +751,10 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { skeleton.insert(0, LOW_Y); setFallbackPattern(UCAL_YEAR, skeleton, status); } - + /* - * 2) otherwise, present the date followed by the - * range expression for the time. + * 2) otherwise, present the date followed by the + * range expression for the time. */ if ( fDateTimeFormat == NULL ) { @@ -779,10 +773,10 @@ DateIntervalFormat::initializePattern(UErrorCode& status) { -void U_EXPORT2 -DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, - UnicodeString& dateSkeleton, - UnicodeString& normalizedDateSkeleton, +void U_EXPORT2 +DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, + UnicodeString& dateSkeleton, + UnicodeString& normalizedDateSkeleton, UnicodeString& timeSkeleton, UnicodeString& normalizedTimeSkeleton) { // dateSkeleton follows the sequence of y*M*E*d* @@ -837,7 +831,7 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, dateSkeleton.append(ch); break; case LOW_A: - // 'a' is implicitly handled + // 'a' is implicitly handled timeSkeleton.append(ch); break; case LOW_H: @@ -870,7 +864,7 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, case CAP_A: timeSkeleton.append(ch); normalizedTimeSkeleton.append(ch); - break; + break; } } @@ -927,7 +921,7 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, * Generate date or time interval pattern from resource, * and set them into the interval pattern locale to this formatter. * - * It needs to handle the following: + * It needs to handle the following: * 1. need to adjust field width. * For example, the interval patterns saved in DateIntervalInfo * includes "dMMMy", but not "dMMMMy". @@ -947,7 +941,7 @@ DateIntervalFormat::getDateTimeSkeleton(const UnicodeString& skeleton, * FALSE otherwise. * @stable ICU 4.0 */ -UBool +UBool DateIntervalFormat::setSeparateDateTimePtn( const UnicodeString& dateSkeleton, const UnicodeString& timeSkeleton) { @@ -963,17 +957,17 @@ DateIntervalFormat::setSeparateDateTimePtn( skeleton = &dateSkeleton; } - /* interval patterns for skeleton "dMMMy" (but not "dMMMMy") + /* interval patterns for skeleton "dMMMy" (but not "dMMMMy") * are defined in resource, * interval patterns for skeleton "dMMMMy" are calculated by * 1. get the best match skeleton for "dMMMMy", which is "dMMMy" * 2. get the interval patterns for "dMMMy", - * 3. extend "MMM" to "MMMM" in above interval patterns for "dMMMMy" + * 3. extend "MMM" to "MMMM" in above interval patterns for "dMMMMy" * getBestSkeleton() is step 1. */ // best skeleton, and the difference information int8_t differenceInfo = 0; - const UnicodeString* bestSkeleton = fInfo->getBestSkeleton(*skeleton, + const UnicodeString* bestSkeleton = fInfo->getBestSkeleton(*skeleton, differenceInfo); /* best skeleton could be NULL. For example: in "ca" resource file, @@ -985,9 +979,9 @@ DateIntervalFormat::setSeparateDateTimePtn( and the best skeleton match could be NULL */ if ( bestSkeleton == NULL ) { - return false; - } - + return false; + } + // Set patterns for fallback use, need to do this // before returning if differenceInfo == -1 UErrorCode status; @@ -1006,10 +1000,10 @@ DateIntervalFormat::setSeparateDateTimePtn( // 0 means the best matched skeleton is the same as input skeleton // 1 means the fields are the same, but field width are different // 2 means the only difference between fields are v/z, - // -1 means there are other fields difference + // -1 means there are other fields difference // (this will happen, for instance, if the supplied skeleton has seconds, // but no skeletons in the intervalFormats data do) - if ( differenceInfo == -1 ) { + if ( differenceInfo == -1 ) { // skeleton has different fields, not only v/z difference return false; } @@ -1021,10 +1015,10 @@ DateIntervalFormat::setSeparateDateTimePtn( setIntervalPattern(UCAL_DATE, skeleton, bestSkeleton, differenceInfo, &extendedSkeleton, &extendedBestSkeleton); - UBool extended = setIntervalPattern(UCAL_MONTH, skeleton, bestSkeleton, + UBool extended = setIntervalPattern(UCAL_MONTH, skeleton, bestSkeleton, differenceInfo, &extendedSkeleton, &extendedBestSkeleton); - + if ( extended ) { bestSkeleton = &extendedBestSkeleton; skeleton = &extendedSkeleton; @@ -1060,9 +1054,9 @@ DateIntervalFormat::setFallbackPattern(UCalendarDateFields field, void -DateIntervalFormat::setPatternInfo(UCalendarDateFields field, +DateIntervalFormat::setPatternInfo(UCalendarDateFields field, const UnicodeString* firstPart, - const UnicodeString* secondPart, + const UnicodeString* secondPart, UBool laterDateFirst) { // for fall back interval patterns, // the first part of the pattern is empty, @@ -1105,7 +1099,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, UnicodeString realPattern; if ( intervalPattern.startsWith(gLaterFirstPrefix, prefixLength) ) { order = true; - intervalPattern.extract(prefixLength, + intervalPattern.extract(prefixLength, intervalPattern.length() - prefixLength, realPattern); pattern = &realPattern; @@ -1119,7 +1113,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, } int32_t splitPoint = splitPatternInto2Part(*pattern); - + UnicodeString firstPart; UnicodeString secondPart; pattern->extract(0, splitPoint, firstPart); @@ -1146,11 +1140,11 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, * 0 means the best matched skeleton is the same as input skeleton * 1 means the fields are the same, but field width are different * 2 means the only difference between fields are v/z, - * -1 means there are other fields difference + * -1 means there are other fields difference * * @param extendedSkeleton extended skeleton * @param extendedBestSkeleton extended best match skeleton - * @return whether the interval pattern is found + * @return whether the interval pattern is found * through extending skeleton or not. * TRUE if interval pattern is found by * extending skeleton, FALSE otherwise. @@ -1175,7 +1169,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, } // for 24 hour system, interval patterns in resource file - // might not include pattern when am_pm differ, + // might not include pattern when am_pm differ, // which should be the same as hour differ. // add it here for simplicity if ( field == UCAL_AM_PM ) { @@ -1184,7 +1178,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, setIntervalPattern(field, pattern); } return false; - } + } // else, looking for pattern when 'y' differ for 'dMMMM' skeleton, // first, get best match pattern "MMMd", // since there is no pattern for 'y' differs for skeleton 'MMMd', @@ -1198,11 +1192,11 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, extendedSkeleton->insert(0, fieldLetter); extendedBestSkeleton->insert(0, fieldLetter); // for example, looking for patterns when 'y' differ for - // skeleton "MMMM". + // skeleton "MMMM". fInfo->getIntervalPattern(*extendedBestSkeleton,field,pattern,status); if ( pattern.isEmpty() && differenceInfo == 0 ) { // if there is no skeleton "yMMMM" defined, - // look for the best match skeleton, for example: "yMMM" + // look for the best match skeleton, for example: "yMMM" const UnicodeString* tmpBest = fInfo->getBestSkeleton( *extendedBestSkeleton, differenceInfo); if ( tmpBest != 0 && differenceInfo != -1 ) { @@ -1211,7 +1205,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, } } } - } + } if ( !pattern.isEmpty() ) { if ( differenceInfo != 0 ) { UnicodeString adjustIntervalPattern; @@ -1230,7 +1224,7 @@ DateIntervalFormat::setIntervalPattern(UCalendarDateFields field, -int32_t U_EXPORT2 +int32_t U_EXPORT2 DateIntervalFormat::splitPatternInto2Part(const UnicodeString& intervalPattern) { UBool inQuote = false; UChar prevCh = 0; @@ -1240,7 +1234,7 @@ DateIntervalFormat::splitPatternInto2Part(const UnicodeString& intervalPattern) It is a pattern applies to first calendar if it is first time seen, otherwise, it is a pattern applies to the second calendar */ - UBool patternRepeated[] = + UBool patternRepeated[] = { // A B C D E F G H I J K L M N O 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1253,16 +1247,16 @@ DateIntervalFormat::splitPatternInto2Part(const UnicodeString& intervalPattern) }; int8_t PATTERN_CHAR_BASE = 0x41; - + /* loop through the pattern string character by character looking for * the first repeated pattern letter, which breaks the interval pattern - * into 2 parts. + * into 2 parts. */ int32_t i; UBool foundRepetition = false; for (i = 0; i < intervalPattern.length(); ++i) { UChar ch = intervalPattern.charAt(i); - + if (ch != prevCh && count > 0) { // check the repeativeness of pattern letter UBool repeated = patternRepeated[(int)(prevCh - PATTERN_CHAR_BASE)]; @@ -1277,23 +1271,23 @@ DateIntervalFormat::splitPatternInto2Part(const UnicodeString& intervalPattern) if (ch == '\'') { // Consecutive single quotes are a single quote literal, // either outside of quotes or between quotes - if ((i+1) < intervalPattern.length() && + if ((i+1) < intervalPattern.length() && intervalPattern.charAt(i+1) == '\'') { ++i; } else { inQuote = ! inQuote; } - } + } else if (!inQuote && ((ch >= 0x0061 /*'a'*/ && ch <= 0x007A /*'z'*/) || (ch >= 0x0041 /*'A'*/ && ch <= 0x005A /*'Z'*/))) { - // ch is a date-time pattern character + // ch is a date-time pattern character prevCh = ch; ++count; } } // check last pattern char, distinguish - // "dd MM" ( no repetition ), - // "d-d"(last char repeated ), and + // "dd MM" ( no repetition ), + // "d-d"(last char repeated ), and // "d-d MM" ( repetition found ) if ( count > 0 && foundRepetition == FALSE ) { if ( patternRepeated[(int)(prevCh - PATTERN_CHAR_BASE)] == FALSE ) { @@ -1340,7 +1334,7 @@ DateIntervalFormat::adjustPosition(UnicodeString& combiningPattern, // has {0} a } } -UnicodeString& +UnicodeString& DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, Calendar& toCalendar, UBool fromToOnSameDay, // new @@ -1397,7 +1391,7 @@ DateIntervalFormat::fallbackFormat(Calendar& fromCalendar, -UBool U_EXPORT2 +UBool U_EXPORT2 DateIntervalFormat::fieldExistsInSkeleton(UCalendarDateFields field, const UnicodeString& skeleton) { @@ -1407,14 +1401,14 @@ DateIntervalFormat::fieldExistsInSkeleton(UCalendarDateFields field, -void U_EXPORT2 +void U_EXPORT2 DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, const UnicodeString& bestMatchSkeleton, const UnicodeString& bestIntervalPattern, int8_t differenceInfo, UnicodeString& adjustedPtn) { adjustedPtn = bestIntervalPattern; - int32_t inputSkeletonFieldWidth[] = + int32_t inputSkeletonFieldWidth[] = { // A B C D E F G H I J K L M N O 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1426,7 +1420,7 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - int32_t bestMatchSkeletonFieldWidth[] = + int32_t bestMatchSkeletonFieldWidth[] = { // A B C D E F G H I J K L M N O 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1450,8 +1444,8 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, int32_t count = 0; const int8_t PATTERN_CHAR_BASE = 0x41; - - // loop through the pattern string character by character + + // loop through the pattern string character by character int32_t adjustedPtnLength = adjustedPtn.length(); int32_t i; for (i = 0; i < adjustedPtnLength; ++i) { @@ -1460,9 +1454,9 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, // check the repeativeness of pattern letter UChar skeletonChar = prevCh; if ( skeletonChar == CAP_L ) { - // there is no "L" (always be "M") in skeleton, + // there is no "L" (always be "M") in skeleton, // but there is "L" in pattern. - // for skeleton "M+", the pattern might be "...L..." + // for skeleton "M+", the pattern might be "...L..." skeletonChar = CAP_M; } int32_t fieldCount = bestMatchSkeletonFieldWidth[(int)(skeletonChar - PATTERN_CHAR_BASE)]; @@ -1471,8 +1465,8 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, count = inputFieldCount - fieldCount; int32_t j; for ( j = 0; j < count; ++j ) { - adjustedPtn.insert(i, prevCh); - } + adjustedPtn.insert(i, prevCh); + } i += count; adjustedPtnLength += count; } @@ -1486,10 +1480,10 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, } else { inQuote = ! inQuote; } - } - else if ( ! inQuote && ((ch >= 0x0061 /*'a'*/ && ch <= 0x007A /*'z'*/) + } + else if ( ! inQuote && ((ch >= 0x0061 /*'a'*/ && ch <= 0x007A /*'z'*/) || (ch >= 0x0041 /*'A'*/ && ch <= 0x005A /*'Z'*/))) { - // ch is a date-time pattern character + // ch is a date-time pattern character prevCh = ch; ++count; } @@ -1499,9 +1493,9 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, // check the repeativeness of pattern letter UChar skeletonChar = prevCh; if ( skeletonChar == CAP_L ) { - // there is no "L" (always be "M") in skeleton, + // there is no "L" (always be "M") in skeleton, // but there is "L" in pattern. - // for skeleton "M+", the pattern might be "...L..." + // for skeleton "M+", the pattern might be "...L..." skeletonChar = CAP_M; } int32_t fieldCount = bestMatchSkeletonFieldWidth[(int)(skeletonChar - PATTERN_CHAR_BASE)]; @@ -1510,15 +1504,15 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, count = inputFieldCount - fieldCount; int32_t j; for ( j = 0; j < count; ++j ) { - adjustedPtn.append(prevCh); - } + adjustedPtn.append(prevCh); + } } } } -void +void DateIntervalFormat::concatSingleDate2TimeInterval(UnicodeString& format, const UnicodeString& datePattern, UCalendarDateFields field, @@ -1540,7 +1534,7 @@ DateIntervalFormat::concatSingleDate2TimeInterval(UnicodeString& format, return; } setIntervalPattern(field, combinedPattern, timeItvPtnInfo.laterDateFirst); - } + } // else: fall back // it should not happen if the interval format defined is valid } diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp index 30d8ad9a75d..398846bc7ff 100644 --- a/icu4c/source/test/intltest/dtifmtts.cpp +++ b/icu4c/source/test/intltest/dtifmtts.cpp @@ -1,5 +1,5 @@ /******************************************************************** - * COPYRIGHT: + * COPYRIGHT: * Copyright (c) 1997-2016, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -13,7 +13,7 @@ //#define DTIFMTTS_DEBUG 1 -#ifdef DTIFMTTS_DEBUG +#ifdef DTIFMTTS_DEBUG #include #endif @@ -32,7 +32,7 @@ -#ifdef DTIFMTTS_DEBUG +#ifdef DTIFMTTS_DEBUG //#define PRINTMESG(msg) { std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; } #define PRINTMESG(msg) { std::cout << msg; } #endif @@ -52,6 +52,7 @@ void DateIntervalFormatTest::runIndexedTest( int32_t index, UBool exec, const ch TESTCASE(6, testTicket11583_2); TESTCASE(7, testTicket11985); TESTCASE(8, testTicket11669); + TESTCASE(9, testTicket12065); default: name = ""; break; } } @@ -65,7 +66,7 @@ void DateIntervalFormatTest::testAPI() { */ UErrorCode status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with default locale and skeleton"); - + DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, status); if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + default locale) - exitting"); @@ -79,7 +80,7 @@ void DateIntervalFormatTest::testAPI() { */ status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with given locale and skeleton"); - + dtitvfmt = DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, Locale::getJapanese(), status); if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + locale) - exitting"); @@ -93,7 +94,7 @@ void DateIntervalFormatTest::testAPI() { */ status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with dateIntervalInfo and skeleton"); - + DateIntervalInfo* dtitvinf = new DateIntervalInfo(Locale::getSimplifiedChinese(), status); dtitvfmt = DateIntervalFormat::createInstance("EEEdMMMyhms", *dtitvinf, status); @@ -104,14 +105,14 @@ void DateIntervalFormatTest::testAPI() { return; } else { delete dtitvfmt; - } + } /* ====== Test create interval instance with dateIntervalInfo and skeleton */ status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with dateIntervalInfo and skeleton"); - + dtitvinf = new DateIntervalInfo(Locale::getSimplifiedChinese(), status); dtitvfmt = DateIntervalFormat::createInstance("EEEdMMMyhms", Locale::getSimplifiedChinese(), *dtitvinf, status); @@ -119,8 +120,8 @@ void DateIntervalFormatTest::testAPI() { if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + DateIntervalInfo + locale) - exitting"); return; - } - // not deleted, test clone + } + // not deleted, test clone // ====== Test clone() @@ -195,7 +196,7 @@ void DateIntervalFormatTest::testAPI() { errln("DateIntervalFormat.setIntervalInfo should have no side effects."); } } - + /* status = U_ZERO_ERROR; DateIntervalInfo* nonConstInf = inf->clone(); @@ -207,7 +208,7 @@ void DateIntervalFormatTest::testAPI() { */ // ====== Test getDateFormat, setDateFormat, adoptDateFormat - + status = U_ZERO_ERROR; logln("Testing DateIntervalFormat getDateFormat"); /* @@ -237,7 +238,7 @@ void DateIntervalFormatTest::testAPI() { if(dtitvfmt->getDynamicClassID() != DateIntervalFormat::getStaticClassID()) { errln("ERROR: getDynamicClassID() didn't return the expected value"); } - + delete another; // ====== test constructor/copy constructor and assignment @@ -253,7 +254,7 @@ void DateIntervalFormatTest::testAPI() { if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (default) - exitting"); return; - } + } DateIntervalFormat* dtifmt2 = new(dtifmt); if ( (*dtifmt) != (*dtifmt2) ) { @@ -329,7 +330,7 @@ void DateIntervalFormatTest::testAPI() { if ( U_SUCCESS(status) ) { UDate date1 = 1299090600000.0; // 2011-Mar-02 1030 in US/Pacific, 2011-Mar-03 0330 in Asia/Tokyo UDate date2 = 1299115800000.0; // 2011-Mar-02 1730 in US/Pacific, 2011-Mar-03 1030 in Asia/Tokyo - + DateInterval * dtitv12 = new DateInterval(date1, date2); TimeZone * tzCalif = TimeZone::createTimeZone("US/Pacific"); TimeZone * tzTokyo = TimeZone::createTimeZone("Asia/Tokyo"); @@ -361,7 +362,7 @@ void DateIntervalFormatTest::testAPI() { } else { errln("ERROR: DateIntervalFormat::format for tzTokyo, status %s", u_errorName(status)); } - + if ( dtitvfmt->getTimeZone() != *tzTokyo ) { errln("ERROR: DateIntervalFormat::getTimeZone returns mismatch."); } @@ -373,7 +374,7 @@ void DateIntervalFormatTest::testAPI() { errln("ERROR: DateIntervalFormat::createInstance(\"MdHH\", Locale::getEnglish(), ...), status %s", u_errorName(status)); } //====== test format in testFormat() - + //====== test DateInterval class (better coverage) DateInterval dtitv1(3600*24*365, 3600*24*366); DateInterval dtitv2(dtitv1); @@ -403,638 +404,638 @@ void DateIntervalFormatTest::testFormat() { // first item is date pattern // followed by a group of locale/from_data/to_data/skeleton/interval_data const char* DATA[] = { - "yyyy MM dd HH:mm:ss", + "yyyy MM dd HH:mm:ss", // test root "root", "2007 11 10 10:10:10", "2007 12 10 10:10:10", "yM", "2007-11 \\u2013 2007-12", - + // test 'H' and 'h', using availableFormat in fallback "en", "2007 11 10 10:10:10", "2007 11 10 15:10:10", "Hms", "10:10:10 \\u2013 15:10:10", "en", "2007 11 10 10:10:10", "2007 11 10 15:10:10", "hms", "10:10:10 AM \\u2013 3:10:10 PM", - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMM", "October 2007 \\u2013 October 2008", - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMM", "Oct 2007 \\u2013 Oct 2008", + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMM", "October 2007 \\u2013 October 2008", + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMM", "Oct 2007 \\u2013 Oct 2008", // test skeleton with both date and time - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 AM \\u2013 Nov 20, 2007, 10:10 AM", - - "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 \\u2013 11:10 AM", - - "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "hms", "10:10:10 AM \\u2013 11:10:10 AM", - "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "Hms", "10:10:10 \\u2013 11:10:10", - "en", "2007 11 10 20:10:10", "2007 11 10 21:10:10", "Hms", "20:10:10 \\u2013 21:10:10", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMMy", "October 10, 2007 \\u2013 October 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMM", "October 10, 2007 \\u2013 October 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMMy", "October 2007 \\u2013 October 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMMMy", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMy", "Oct 10, 2007 \\u2013 Oct 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMM", "Oct 10, 2007 \\u2013 Oct 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMy", "Oct 2007 \\u2013 Oct 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMMM", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10/10/2007 \\u2013 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dM", "10/10/2007 \\u2013 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10/2007 \\u2013 10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "d", "10/10/2007 \\u2013 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Ed", "10 Wed \\u2013 10 Fri", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007 \\u2013 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10/2007 \\u2013 10/2008", - - - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 10/10/2008, 10:10", - "en", "2007 10 10 20:10:10", "2008 10 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 10/10/2008, 20:10", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 10/10/2008, 10:10 AM PT", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 10/10/2008, 10 AM", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 10/10/2008, 10 AM PT", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 10/10/2008, 10 AM PDT", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hhmm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 10/10/2008, 10:10:10 AM", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMMMy", "O 10, 2007 \\u2013 O 10, 2008", - - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/2007 \\u2013 F, 10/10/2008", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10 \\u2013 Saturday, November 10, 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMy", "October 10 \\u2013 November 10, 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMM", "October 10 \\u2013 November 10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMMy", "October \\u2013 November 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10 \\u2013 Saturday, November 10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMMMy", "Wed, Oct 10 \\u2013 Sat, Nov 10, 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMy", "Oct 10 \\u2013 Nov 10, 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMM", "Oct 10 \\u2013 Nov 10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMy", "Oct \\u2013 Nov 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMMM", "Wed, Oct 10 \\u2013 Sat, Nov 10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMy", "10/10/2007 \\u2013 11/10/2007", - - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10/2007 \\u2013 11/2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdM", "Wed, 10/10 \\u2013 Sat, 11/10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "d", "10/10 \\u2013 11/10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Ed", "10 Wed \\u2013 10 Sat", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "y", "2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "M", "10 \\u2013 11", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMM", "Oct \\u2013 Nov", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMM", "October \\u2013 November", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 11/10/2007, 10:10 AM", - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 11/10/2007, 10:10", - "en", "2007 10 10 20:10:10", "2007 11 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 11/10/2007, 20:10", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 11/10/2007, 10:10 AM PT", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 11/10/2007, 10 AM", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 11/10/2007, 10 AM PT", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 11/10/2007, 10 AM PST", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", - - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 11/10/2007, 10:10:10 AM", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMMy", "O 10 \\u2013 N 10, 2007", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEEdM", "W, 10/10 \\u2013 S, 11/10", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "Saturday, November 10 \\u2013 Tuesday, November 20, 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMMy", "November 10 \\u2013 20, 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMM", "November 10 \\u2013 20", - - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMM", "Saturday, November 10 \\u2013 Tuesday, November 20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMMMy", "Sat, Nov 10 \\u2013 Tue, Nov 20, 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMy", "Nov 10 \\u2013 20, 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMM", "Nov 10 \\u2013 20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMy", "Nov 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMMM", "Sat, Nov 10 \\u2013 Tue, Nov 20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMy", "11/10/2007 \\u2013 11/20/2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "11/2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdM", "Sat, 11/10 \\u2013 Tue, 11/20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "d", "10 \\u2013 20", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Ed", "10 Sat \\u2013 20 Tue", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "M", "11", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMM", "Nov", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMM", "November", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Hm", "11/10/2007, 10:10 \\u2013 11/20/2007, 10:10", - "en", "2007 11 10 20:10:10", "2007 11 20 20:10:10", "Hm", "11/10/2007, 20:10 \\u2013 11/20/2007, 20:10", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "11/10/2007, 10:10 AM PT \\u2013 11/20/2007, 10:10 AM PT", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "11/10/2007, 10 AM \\u2013 11/20/2007, 10 AM", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hv", "11/10/2007, 10 AM PT \\u2013 11/20/2007, 10 AM PT", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hz", "11/10/2007, 10 AM PST \\u2013 11/20/2007, 10 AM PST", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hhmm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hhmmzz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hms", "11/10/2007, 10:10:10 AM \\u2013 11/20/2007, 10:10:10 AM", - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Hms", "11/10/2007, 10:10:10 \\u2013 11/20/2007, 10:10:10", - "en", "2007 11 10 20:10:10", "2007 11 20 20:10:10", "Hms", "11/10/2007, 20:10:10 \\u2013 11/20/2007, 20:10:10", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMMMy", "N 10 \\u2013 20, 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEEdM", "S, 11/10 \\u2013 T, 11/20", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "Wednesday, January 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMMy", "January 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMM", "January 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMMy", "January 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMM", "Wednesday, January 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdMMMy", "Wed, Jan 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMy", "Jan 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMM", "Jan 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMy", "Jan 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdMMM", "Wed, Jan 10", - - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMy", "1/10/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dM", "1/10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "My", "1/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdM", "Wed, 1/10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "d", "10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Ed", "10 Wed", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "y", "2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "M", "1", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMM", "Jan", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMM", "January", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hm", "10:00 AM \\u2013 2:10 PM", - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hm", "10:00 \\u2013 14:10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmv", "10:00 AM \\u2013 2:10 PM PT", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 AM \\u2013 2:10 PM PST", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 AM \\u2013 2 PM", - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10 \\u2013 14", - - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hz", "10 AM \\u2013 2 PM PST", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEddMMyyyy", "Wed, 01/10/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EddMMy", "Wed, 01/10/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmm", "10:00 AM \\u2013 2:10 PM", - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "HHmm", "10:00 \\u2013 14:10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmmzz", "10:00 AM \\u2013 2:10 PM PST", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hms", "10:00:10 AM \\u2013 2:10:10 PM", - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hms", "10:00:10 \\u2013 14:10:10", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMMMy", "J 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEEdM", "W, 1/10", - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMMy", "January 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMM", "January 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "MMMMy", "January 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMMM", "Wednesday, January 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMMMy", "Wed, Jan 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMy", "Jan 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMM", "Jan 10", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMMM", "Wed, Jan 10", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMy", "Wed, 1/10/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMy", "1/10/2007", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "My", "1/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdM", "Wed, 1/10", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "d", "10", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "y", "2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "M", "1", - - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hm", "10:00 \\u2013 10:20 AM", - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Hm", "10:00 \\u2013 10:20", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00 \\u2013 10:20 AM PST", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hv", "10 AM PT", - - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EddMMy", "Wed, 01/10/2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmm", "10:00 \\u2013 10:20 AM", - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "HHmm", "10:00 \\u2013 10:20", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmmzz", "10:00 \\u2013 10:20 AM PST", - - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMMMy", "J 10, 2007", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMMy", "Wednesday, January 10, 2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMMy", "January 10, 2007", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "MMMMy", "January 2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMM", "Wednesday, January 10", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMy", "Jan 10, 2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMM", "Jan 10", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdMMM", "Wed, Jan 10", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdMy", "Wed, 1/10/2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMy", "1/10/2007", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "My", "1/2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdM", "Wed, 1/10", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "d", "10", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "y", "2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "M", "1", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "MMMM", "January", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hm", "10:10 AM", - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "Hm", "10:10", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 AM PST", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "10 AM", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 AM PT", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEddMMyyyy", "Wed, 01/10/2007", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hhmm", "10:10 AM", - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "HHmm", "10:10", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hhmmzz", "10:10 AM PST", - - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMMMy", "J 10, 2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEEdM", "W, 1/10", - - "zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f32008\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e94", - - - "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u81f311\\u670810\\u65e5", - - - "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMMy", "2007\\u5e7410\\u6708\\u81f311\\u6708", - - - "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", - - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMM", "11\\u670810\\u65e5\\u81f320\\u65e5", - + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 AM \\u2013 Nov 20, 2007, 10:10 AM", + + "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 \\u2013 11:10 AM", + + "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "hms", "10:10:10 AM \\u2013 11:10:10 AM", + "en", "2007 11 10 10:10:10", "2007 11 10 11:10:10", "Hms", "10:10:10 \\u2013 11:10:10", + "en", "2007 11 10 20:10:10", "2007 11 10 21:10:10", "Hms", "20:10:10 \\u2013 21:10:10", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMMy", "October 10, 2007 \\u2013 October 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMM", "October 10, 2007 \\u2013 October 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMMy", "October 2007 \\u2013 October 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMMMy", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMy", "Oct 10, 2007 \\u2013 Oct 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMM", "Oct 10, 2007 \\u2013 Oct 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMy", "Oct 2007 \\u2013 Oct 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMMM", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10/10/2007 \\u2013 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dM", "10/10/2007 \\u2013 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10/2007 \\u2013 10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "d", "10/10/2007 \\u2013 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Ed", "10 Wed \\u2013 10 Fri", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007 \\u2013 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10/2007 \\u2013 10/2008", + + + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 10/10/2008, 10:10", + "en", "2007 10 10 20:10:10", "2008 10 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 10/10/2008, 20:10", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 10/10/2008, 10:10 AM PT", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 10/10/2008, 10 AM", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 10/10/2008, 10 AM PT", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 10/10/2008, 10 AM PDT", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hhmm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 10/10/2008, 10:10:10 AM", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMMMMy", "O 10, 2007 \\u2013 O 10, 2008", + + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/2007 \\u2013 F, 10/10/2008", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10 \\u2013 Saturday, November 10, 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMy", "October 10 \\u2013 November 10, 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMM", "October 10 \\u2013 November 10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMMy", "October \\u2013 November 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10 \\u2013 Saturday, November 10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMMMy", "Wed, Oct 10 \\u2013 Sat, Nov 10, 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMy", "Oct 10 \\u2013 Nov 10, 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMM", "Oct 10 \\u2013 Nov 10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMy", "Oct \\u2013 Nov 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMMM", "Wed, Oct 10 \\u2013 Sat, Nov 10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMy", "10/10/2007 \\u2013 11/10/2007", + + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10/2007 \\u2013 11/2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EdM", "Wed, 10/10 \\u2013 Sat, 11/10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "d", "10/10 \\u2013 11/10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Ed", "10 Wed \\u2013 10 Sat", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "y", "2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "M", "10 \\u2013 11", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMM", "Oct \\u2013 Nov", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMM", "October \\u2013 November", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 11/10/2007, 10:10 AM", + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 11/10/2007, 10:10", + "en", "2007 10 10 20:10:10", "2007 11 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 11/10/2007, 20:10", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 11/10/2007, 10:10 AM PT", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 11/10/2007, 10 AM", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 11/10/2007, 10 AM PT", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 11/10/2007, 10 AM PST", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 11/10/2007, 10:10:10 AM", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMMy", "O 10 \\u2013 N 10, 2007", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEEdM", "W, 10/10 \\u2013 S, 11/10", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "Saturday, November 10 \\u2013 Tuesday, November 20, 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMMy", "November 10 \\u2013 20, 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMM", "November 10 \\u2013 20", + + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMM", "Saturday, November 10 \\u2013 Tuesday, November 20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMMMy", "Sat, Nov 10 \\u2013 Tue, Nov 20, 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMy", "Nov 10 \\u2013 20, 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMM", "Nov 10 \\u2013 20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMy", "Nov 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMMM", "Sat, Nov 10 \\u2013 Tue, Nov 20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMy", "11/10/2007 \\u2013 11/20/2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "11/2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdM", "Sat, 11/10 \\u2013 Tue, 11/20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "d", "10 \\u2013 20", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Ed", "10 Sat \\u2013 20 Tue", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "M", "11", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMM", "Nov", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMM", "November", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Hm", "11/10/2007, 10:10 \\u2013 11/20/2007, 10:10", + "en", "2007 11 10 20:10:10", "2007 11 20 20:10:10", "Hm", "11/10/2007, 20:10 \\u2013 11/20/2007, 20:10", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "11/10/2007, 10:10 AM PT \\u2013 11/20/2007, 10:10 AM PT", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "11/10/2007, 10 AM \\u2013 11/20/2007, 10 AM", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hv", "11/10/2007, 10 AM PT \\u2013 11/20/2007, 10 AM PT", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hz", "11/10/2007, 10 AM PST \\u2013 11/20/2007, 10 AM PST", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hhmm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hhmmzz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hms", "11/10/2007, 10:10:10 AM \\u2013 11/20/2007, 10:10:10 AM", + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Hms", "11/10/2007, 10:10:10 \\u2013 11/20/2007, 10:10:10", + "en", "2007 11 10 20:10:10", "2007 11 20 20:10:10", "Hms", "11/10/2007, 20:10:10 \\u2013 11/20/2007, 20:10:10", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMMMy", "N 10 \\u2013 20, 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEEdM", "S, 11/10 \\u2013 T, 11/20", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "Wednesday, January 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMMy", "January 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMM", "January 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMMy", "January 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMM", "Wednesday, January 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdMMMy", "Wed, Jan 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMy", "Jan 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMM", "Jan 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMy", "Jan 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdMMM", "Wed, Jan 10", + + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMy", "1/10/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dM", "1/10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "My", "1/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EdM", "Wed, 1/10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "d", "10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Ed", "10 Wed", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "y", "2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "M", "1", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMM", "Jan", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMM", "January", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hm", "10:00 AM \\u2013 2:10 PM", + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hm", "10:00 \\u2013 14:10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmv", "10:00 AM \\u2013 2:10 PM PT", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 AM \\u2013 2:10 PM PST", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 AM \\u2013 2 PM", + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10 \\u2013 14", + + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hz", "10 AM \\u2013 2 PM PST", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEddMMyyyy", "Wed, 01/10/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EddMMy", "Wed, 01/10/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmm", "10:00 AM \\u2013 2:10 PM", + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "HHmm", "10:00 \\u2013 14:10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hhmmzz", "10:00 AM \\u2013 2:10 PM PST", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hms", "10:00:10 AM \\u2013 2:10:10 PM", + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Hms", "10:00:10 \\u2013 14:10:10", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMMMMy", "J 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEEdM", "W, 1/10", + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMMy", "January 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMM", "January 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "MMMMy", "January 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMMM", "Wednesday, January 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMMMy", "Wed, Jan 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMy", "Jan 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMM", "Jan 10", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMMM", "Wed, Jan 10", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdMy", "Wed, 1/10/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMy", "1/10/2007", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "My", "1/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EdM", "Wed, 1/10", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "d", "10", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "y", "2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "M", "1", + + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hm", "10:00 \\u2013 10:20 AM", + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Hm", "10:00 \\u2013 10:20", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00 \\u2013 10:20 AM PST", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hv", "10 AM PT", + + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EddMMy", "Wed, 01/10/2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmm", "10:00 \\u2013 10:20 AM", + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "HHmm", "10:00 \\u2013 10:20", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hhmmzz", "10:00 \\u2013 10:20 AM PST", + + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "dMMMMMy", "J 10, 2007", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMMy", "Wednesday, January 10, 2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMMy", "January 10, 2007", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "MMMMy", "January 2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMM", "Wednesday, January 10", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMy", "Jan 10, 2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMM", "Jan 10", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdMMM", "Wed, Jan 10", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdMy", "Wed, 1/10/2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMy", "1/10/2007", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "My", "1/2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EdM", "Wed, 1/10", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "d", "10", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "y", "2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "M", "1", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "MMMM", "January", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hm", "10:10 AM", + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "Hm", "10:10", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 AM PST", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "10 AM", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 AM PT", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEddMMyyyy", "Wed, 01/10/2007", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hhmm", "10:10 AM", + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "HHmm", "10:10", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hhmmzz", "10:10 AM PST", + + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "dMMMMMy", "J 10, 2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEEdM", "W, 1/10", + + "zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f32008\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e94", + + + "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u81f311\\u670810\\u65e5", + + + "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMMy", "2007\\u5e7410\\u6708\\u81f311\\u6708", + + + "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", + + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMM", "11\\u670810\\u65e5\\u81f320\\u65e5", + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMMy", "2007\\u5E7411\\u6708", // (fixed expected result per ticket:6626:) - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMM", "11\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", - - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "2007/11/10\\u5468\\u516d\\u81f32007/11/20\\u5468\\u4e8c", - - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20", - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "2007\\u5E7411\\u6708", - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdM", "11/10\\u5468\\u516d\\u81f311/20\\u5468\\u4e8c", - - + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMM", "11\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", + + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "2007/11/10\\u5468\\u516d\\u81f32007/11/20\\u5468\\u4e8c", + + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20", + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "2007\\u5E7411\\u6708", + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdM", "11/10\\u5468\\u516d\\u81f311/20\\u5468\\u4e8c", + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007\\u5E74", // (fixed expected result per ticket:6626:) - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "M", "11\\u6708", - + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "M", "11\\u6708", + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMM", "11\\u6708", // (fixed expected result per ticket:6626: and others) - - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", - - "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", - + + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", + + "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", + "zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket:6626:) - - "zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hm", "\\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", "hm", "\\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 10:20:10", "hm", "\\u4e0a\\u534810:00\\u81f310:20", - + + "zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hm", "\\u4e0a\\u534810:00\\u81f310:20", + "zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4\\u4E0A\\u534810:00\\u81F310:20", - - "zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "GMT-8\\u4e0a\\u534810\\u65f6", - - "zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hm", "\\u4e0a\\u534810:10", - - "zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "\\u4e0a\\u534810\\u65f6", - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. 2007 \\u2013 Freitag, 10. Okt. 2008", - - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMM", "10. Okt. 2007 \\u2013 10. Okt. 2008", - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMy", "Okt. 2007 \\u2013 Okt. 2008", - - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10.10.2007 \\u2013 10.10.2008", - - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10.2007 \\u2013 10.2008", - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", - - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007\\u20132008", - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10.2007 \\u2013 10.2008", - - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10.10.2007, 10:10 vorm. \\u2013 10.10.2008, 10:10 vorm.", - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Hm", "10.10.2007, 10:10 \\u2013 10.10.2008, 10:10", - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov. 2007", - - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMM", "10. Okt. \\u2013 10. Nov.", - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMy", "Okt.\\u2013Nov. 2007", - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMM", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov.", - - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dM", "10.10. \\u2013 10.11.", - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10.2007 \\u2013 11.2007", - - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "d", "10.10. \\u2013 10.11.", - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "y", "2007", - - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMM", "Okt.\\u2013Nov.", - - - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10 vorm. \\u2013 10.11.2007, 10:10:10 vorm.", - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Hms", "10.10.2007, 10:10:10 \\u2013 10.11.2007, 10:10:10", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMy", "Samstag, 10. \\u2013 Dienstag, 20. Nov. 2007", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMy", "10.\\u201320. Nov. 2007", - - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMy", "Nov. 2007", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMM", "Samstag, 10. \\u2013 Dienstag, 20. Nov.", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sa., 10.11.2007 \\u2013 Di., 20.11.2007", - - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "10.11. \\u2013 20.11.", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "11.2007", - - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "d", "10.\\u201320.", - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007", - - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10 vorm. Los Angeles Zeit \\u2013 20.11.2007, 10:10 vorm. Los Angeles Zeit", - - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", - - - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMM", "10. Jan.", - - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMy", "Jan. 2007", - - "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", "h", "10 vorm. \\u2013 2 nachm.", - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10\\u201314 Uhr", - - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch, 10. Jan.", - - - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "10:00\\u201310:20 vorm. Los Angeles Zeit", - - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00\\u201310: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", "H", "10 Uhr", - - - "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", - - - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmv", "10:10 vorm. Los Angeles Zeit", - - "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", "hv", "10 vorm. Los Angeles Zeit", - - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. GMT-8", - + + "zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "GMT-8\\u4e0a\\u534810\\u65f6", + + "zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hm", "\\u4e0a\\u534810:10", + + "zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "\\u4e0a\\u534810\\u65f6", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. 2007 \\u2013 Freitag, 10. Okt. 2008", + + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMMM", "10. Okt. 2007 \\u2013 10. Okt. 2008", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "MMMy", "Okt. 2007 \\u2013 Okt. 2008", + + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdMy", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "dMy", "10.10.2007 \\u2013 10.10.2008", + + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "My", "10.2007 \\u2013 10.2008", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EdM", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", + + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "y", "2007\\u20132008", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10.2007 \\u2013 10.2008", + + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10.10.2007, 10:10 vorm. \\u2013 10.10.2008, 10:10 vorm.", + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Hm", "10.10.2007, 10:10 \\u2013 10.10.2008, 10:10", + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov. 2007", + + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMM", "10. Okt. \\u2013 10. Nov.", + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMy", "Okt.\\u2013Nov. 2007", + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMM", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov.", + + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dM", "10.10. \\u2013 10.11.", + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "My", "10.2007 \\u2013 11.2007", + + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "d", "10.10. \\u2013 10.11.", + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "y", "2007", + + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMM", "Okt.\\u2013Nov.", + + + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10 vorm. \\u2013 10.11.2007, 10:10:10 vorm.", + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Hms", "10.10.2007, 10:10:10 \\u2013 10.11.2007, 10:10:10", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMy", "Samstag, 10. \\u2013 Dienstag, 20. Nov. 2007", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dMMMy", "10.\\u201320. Nov. 2007", + + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMy", "Nov. 2007", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMM", "Samstag, 10. \\u2013 Dienstag, 20. Nov.", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EdMy", "Sa., 10.11.2007 \\u2013 Di., 20.11.2007", + + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "dM", "10.11. \\u2013 20.11.", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "My", "11.2007", + + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "d", "10.\\u201320.", + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007", + + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10 vorm. Los Angeles Zeit \\u2013 20.11.2007, 10:10 vorm. Los Angeles Zeit", + + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", + + + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "dMMM", "10. Jan.", + + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMy", "Jan. 2007", + + "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", "h", "10 vorm. \\u2013 2 nachm.", + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10\\u201314 Uhr", + + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch, 10. Jan.", + + + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "10:00\\u201310:20 vorm. Los Angeles Zeit", + + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00\\u201310: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", "H", "10 Uhr", + + + "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", + + + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmv", "10:10 vorm. Los Angeles Zeit", + + "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", "hv", "10 vorm. Los Angeles Zeit", + + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. GMT-8", + // Thai (default calendar buddhist) - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2551", - - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551", - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 \\u2013 \\u0E15.\\u0E04. 2551", - - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 \\u2013 10/10/2551", - - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 \\u2013 10/2551", - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", - - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550\\u20132551", - - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 \\u2013 10/2551", - - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E1E.\\u0E22. 2550", - - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. \\u2013 10 \\u0E1E.\\u0E22.", - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22. 2550", - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 \\u2013 10/11", - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550", - - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11", - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550", - - - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2551", + + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551", + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 \\u2013 \\u0E15.\\u0E04. 2551", + + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 \\u2013 10/10/2551", + + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 \\u2013 10/2551", + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", + + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550\\u20132551", + + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 \\u2013 10/2551", + + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E1E.\\u0E22. 2550", + + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. \\u2013 10 \\u0E1E.\\u0E22.", + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22. 2550", + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 \\u2013 10/11", + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550", + + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11", + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550", + + + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.", }; expect(DATA, UPRV_LENGTHOF(DATA)); @@ -1049,9 +1050,9 @@ void DateIntervalFormatTest::expect(const char** data, int32_t data_length) { i++; #ifdef DTIFMTTS_DEBUG - char result[1000]; + char result[1000]; char mesg[1000]; - sprintf(mesg, "locale: %s\n", locName); + sprintf(mesg, "locale: %s\n", locName); PRINTMESG(mesg); #endif @@ -1092,70 +1093,70 @@ void DateIntervalFormatTest::expect(const char** data, int32_t data_length) { sprintf(mesg, "interval date: %s\n", result); std::cout << "//"; PRINTMESG(mesg) - std::cout << "\"" << locName << "\", " - << "\"" << datestr << "\", " + std::cout << "\"" << locName << "\", " + << "\"" << datestr << "\", " << "\"" << datestr_2 << "\", "; printUnicodeString(oneSkeleton); printUnicodeString(str); - std::cout << "\n\n"; + std::cout << "\n\n"; #endif delete dtitvfmt; } } -/* +/* * Test format using user defined DateIntervalInfo */ void DateIntervalFormatTest::testFormatUserDII() { // first item is date pattern const char* DATA[] = { - "yyyy MM dd HH:mm:ss", - "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Oct 10, 2007 --- Oct 10, 2008", - - "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 Oct 10 - Nov 2007", - - "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Nov 10, 2007 --- Nov 20, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Jan 10, 2007", - - "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Jan 10, 2007", - - "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "Jan 10, 2007", - - "zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "2007\\u5e7410\\u670810\\u65e5 --- 2008\\u5e7410\\u670810\\u65e5", - - "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 10\\u6708 10 - 11\\u6708 2007", - - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "2007\\u5e7411\\u670810\\u65e5 --- 2007\\u5e7411\\u670820\\u65e5", - + "yyyy MM dd HH:mm:ss", + "en", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Oct 10, 2007 --- Oct 10, 2008", + + "en", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 Oct 10 - Nov 2007", + + "en", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "Nov 10, 2007 --- Nov 20, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "Jan 10, 2007", + + "en", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "Jan 10, 2007", + + "en", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "Jan 10, 2007", + + "zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "2007\\u5e7410\\u670810\\u65e5 --- 2008\\u5e7410\\u670810\\u65e5", + + "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 10\\u6708 10 - 11\\u6708 2007", + + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "2007\\u5e7411\\u670810\\u65e5 --- 2007\\u5e7411\\u670820\\u65e5", + "zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "2007\\u5e741\\u670810\\u65e5", // (fixed expected result per ticket:6626:) - + "zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "2007\\u5e741\\u670810\\u65e5", // (fixed expected result per ticket:6626:) - + "zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "2007\\u5e741\\u670810\\u65e5", // (fixed expected result per ticket:6626:) - - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10. Okt. 2007 --- 10. Okt. 2008", - - - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10. Nov. 2007 --- 20. Nov. 2007", - - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10. Jan. 2007", - - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10. Jan. 2007", - - - "es", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10 oct. 2007 --- 10 oct. 2008", - - "es", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 oct. 10 - nov. 2007", - - "es", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10 nov. 2007 --- 20 nov. 2007", - - "es", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10 ene. 2007", - - "es", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10 ene. 2007", - - "es", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10 ene. 2007", + + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10. Okt. 2007 --- 10. Okt. 2008", + + + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10. Nov. 2007 --- 20. Nov. 2007", + + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10. Jan. 2007", + + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10. Jan. 2007", + + + "es", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10 oct. 2007 --- 10 oct. 2008", + + "es", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 oct. 10 - nov. 2007", + + "es", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10 nov. 2007 --- 20 nov. 2007", + + "es", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10 ene. 2007", + + "es", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10 ene. 2007", + + "es", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10 ene. 2007", }; expectUserDII(DATA, UPRV_LENGTHOF(DATA)); } @@ -1261,7 +1262,7 @@ void DateIntervalFormatTest::testYearFormats() { } } -void DateIntervalFormatTest::expectUserDII(const char** data, +void DateIntervalFormatTest::expectUserDII(const char** data, int32_t data_length) { int32_t i = 0; UnicodeString str; @@ -1301,7 +1302,7 @@ void DateIntervalFormatTest::expectUserDII(const char** data, if (!assertSuccess("format in expectUserDII", ec)) return; assertEquals((UnicodeString)"\"" + locName + "\\" + datestr + "\\" + datestr_2 + "\"", ctou(data[i++]), str); #ifdef DTIFMTTS_DEBUG - char result[1000]; + char result[1000]; char mesg[1000]; PRINTMESG("interval format using user defined DateIntervalInfo\n"); str.extract(0, str.length(), result, "UTF-8"); @@ -1320,12 +1321,12 @@ void DateIntervalFormatTest::testStress() { } const char* DATA[] = { "yyyy MM dd HH:mm:ss", - "2007 10 10 10:10:10", "2008 10 10 10:10:10", - "2007 10 10 10:10:10", "2007 11 10 10:10:10", - "2007 11 10 10:10:10", "2007 11 20 10:10:10", - "2007 01 10 10:00:10", "2007 01 10 14:10:10", - "2007 01 10 10:00:10", "2007 01 10 10:20:10", - "2007 01 10 10:10:10", "2007 01 10 10:10:20", + "2007 10 10 10:10:10", "2008 10 10 10:10:10", + "2007 10 10 10:10:10", "2007 11 10 10:10:10", + "2007 11 10 10:10:10", "2007 11 20 10:10:10", + "2007 01 10 10:00:10", "2007 01 10 14:10:10", + "2007 01 10 10:00:10", "2007 01 10 10:20:10", + "2007 01 10 10:10:10", "2007 01 10 10:10:20", }; const char* testLocale[][3] = { @@ -1411,7 +1412,7 @@ void DateIntervalFormatTest::stress(const char** data, int32_t data_length, "hv", "hz", "EEddMMyyyy", // following could be normalized - "EddMMy", + "EddMMy", "hhmm", "hhmmzz", "hms", // following could not be normalized @@ -1426,9 +1427,9 @@ void DateIntervalFormatTest::stress(const char** data, int32_t data_length, if (!assertSuccess("construct SimpleDateFormat", ec)) return; #ifdef DTIFMTTS_DEBUG - char result[1000]; + char result[1000]; char mesg[1000]; - sprintf(mesg, "locale: %s\n", locName); + sprintf(mesg, "locale: %s\n", locName); PRINTMESG(mesg); #endif @@ -1447,8 +1448,8 @@ void DateIntervalFormatTest::stress(const char** data, int32_t data_length, if (!assertSuccess("parse", ec)) return; DateInterval dtitv(date, date_2); - for ( uint32_t skeletonIndex = 0; - skeletonIndex < UPRV_LENGTHOF(skeleton); + for ( uint32_t skeletonIndex = 0; + skeletonIndex < UPRV_LENGTHOF(skeleton); ++skeletonIndex ) { const UnicodeString& oneSkeleton = skeleton[skeletonIndex]; DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(oneSkeleton, loc, ec); @@ -1503,7 +1504,7 @@ void DateIntervalFormatTest::stress(const char** data, int32_t data_length, PRINTMESG(mesg) #endif } else { - // for "th", the default calendar is Budhist, + // for "th", the default calendar is Budhist, // not Gregorian. assertTrue("Default calendar for \"th\" is Budhist", ec == U_ILLEGAL_ARGUMENT_ERROR); ec = U_ZERO_ERROR; @@ -1545,7 +1546,7 @@ void DateIntervalFormatTest::testTicket11985() { assertEquals("Format pattern", "h:mm a", pattern); } -// Ticket 11669 - thread safety of DateIntervalFormat::format(). This test failed before +// Ticket 11669 - thread safety of DateIntervalFormat::format(). This test failed before // the implementation was fixed. static const DateIntervalFormat *gIntervalFormatter = NULL; // The Formatter to be used concurrently by test threads. @@ -1569,7 +1570,7 @@ void DateIntervalFormatTest::threadFunc11669(int32_t threadNum) { } } } - + void DateIntervalFormatTest::testTicket11669() { UErrorCode status = U_ZERO_ERROR; LocalPointer formatter(DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, Locale::getEnglish(), status), status); @@ -1606,4 +1607,29 @@ void DateIntervalFormatTest::testTicket11669() { } +// testTicket12065 +// Using a DateIntervalFormat to format shouldn't change its state in any way +// that changes how the behavior of operator ==. +void DateIntervalFormatTest::testTicket12065() { + UErrorCode status = U_ZERO_ERROR; + LocalPointer formatter(DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, Locale::getEnglish(), status), status); + LocalPointer clone(dynamic_cast(formatter->clone())); + if (*formatter != *clone) { + errln("%s:%d DateIntervalFormat and clone are not equal.", __FILE__, __LINE__); + return; + } + DateInterval interval((UDate) 1232364615000.0, (UDate) 1328787015000.0); + UnicodeString appendTo; + FieldPosition fpos(FieldPosition::DONT_CARE); + formatter->format(&interval, appendTo, fpos, status); + if (*formatter != *clone) { + errln("%s:%d DateIntervalFormat and clone are not equal after formatting.", __FILE__, __LINE__); + return; + } + if (U_FAILURE(status)) { + errln("%s:%d %s", __FILE__, __LINE__, u_errorName(status)); + } +} + + #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/icu4c/source/test/intltest/dtifmtts.h b/icu4c/source/test/intltest/dtifmtts.h index 5fb64f2b2ef..f45a6cb5cf4 100644 --- a/icu4c/source/test/intltest/dtifmtts.h +++ b/icu4c/source/test/intltest/dtifmtts.h @@ -1,5 +1,5 @@ /******************************************************************** - * COPYRIGHT: + * COPYRIGHT: * Copyright (c) 2008-2016 International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -18,7 +18,7 @@ * Test basic functionality of various API functions **/ class DateIntervalFormatTest: public IntlTest { - void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL ); + void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL ); public: /** @@ -59,6 +59,8 @@ public: void testTicket11669(); void threadFunc11669(int32_t threadNum); + void testTicket12065(); + private: /** * Test formatting against expected result @@ -66,15 +68,15 @@ private: void expect(const char** data, int32_t data_length); /** - * Test formatting against expected result using user defined + * Test formatting against expected result using user defined * DateIntervalInfo */ void expectUserDII(const char** data, int32_t data_length); /** - * Stress test formatting + * Stress test formatting */ - void stress(const char** data, int32_t data_length, const Locale& loc, + void stress(const char** data, int32_t data_length, const Locale& loc, const char* locName); };