From 65ea8e11d6c9ff32f6d2f49165df9c0e06d7736b Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 29 May 2008 20:27:01 +0000 Subject: [PATCH] ICU-6309 update example skeletons from Java src/com/ibm/icu/text/DateFormat.java with UDAT_ prefix X-SVN-Rev: 24073 --- icu4c/source/i18n/unicode/udat.h | 62 ++++++++++++++----------- icu4c/source/test/intltest/dtifmtts.cpp | 10 ++-- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h index 40c61bee41c..beaa1d42adb 100644 --- a/icu4c/source/i18n/unicode/udat.h +++ b/icu4c/source/i18n/unicode/udat.h @@ -231,33 +231,41 @@ typedef enum UDateFormatStyle { * @draft ICU 4.0 */ -#define YEAR_MONTH_DOW_DAY_LONG_FORMAT "yMMMMEEEEd" -#define YEAR_MONTH_DAY_LONG_FORMAT "yMMMMd" -#define MONTH_DAY_LONG_FORMAT "MMMMd" -#define YEAR_MONTH_LONG_FORMAT "yMMMM" -#define MONTH_DOW_DAY_LONG_FORMAT "MMMMEEEEd" -#define YEAR_MONTH_DOW_DAY_MEDIUM_FORMAT "yMMMEEEd" -#define YEAR_MONTH_DAY_MEDIUM_FORMAT "yMMMd" -#define MONTH_DAY_MEDIUM_FORMAT "MMMd" -#define YEAR_MONTH_MEDIUM_FORMAT "yMMM" -#define MONTH_DOW_DAY_MEDIUM_FORMAT "MMMEEEd" -#define YEAR_MONTH_DOW_DAY_SHORT_FORMAT "yMEEEd" -#define YEAR_MONTH_DAY_SHORT_FORMAT "yMd" -#define MONTH_DAY_SHORT_FORMAT "Md" -#define YEAR_MONTH_SHORT_FORMAT "yM" -#define MONTH_DOW_DAY_SHORT_FORMAT "MEEEd" -#define DAY_ONLY_SHORT_FORMAT "d" -#define DOW_DAY_SHORT_FORMAT "EEEd" -#define YEAR_ONLY_SHORT_FORMAT "y" -#define MONTH_ONLY_SHORT_FORMAT "M" -#define MONTH_ONLY_MEDIUM_FORMAT "MMM" -#define MONTH_ONLY_LONG_FORMAT "MMMM" -#define HOUR_MINUTE_FORMAT "hm" -#define HOUR_MINUTE_GENERAL_TZ_FORMAT "hmv" -#define HOUR_MINUTE_DAYLIGNT_TZ_FORMAT "hmz" -#define HOUR_ONLY_FORMAT "h" -#define HOUR_GENERAL_TZ_FORMAT "hv" -#define HOUR_DAYLIGNT_TZ_FORMAT "hz" +#define UDAT_MINUTE_SECOND "ms" +#define UDAT_HOUR24_MINUTE "Hm" +#define UDAT_HOUR24_MINUTE_SECOND "Hms" +#define UDAT_HOUR_MINUTE_SECOND "hms" +#define UDAT_STANDALONE_MONTH "LLLL" +#define UDAT_ABBR_STANDALONE_MONTH "LLL" +#define UDAT_YEAR_QUARTER "yQQQ" +#define UDAT_YEAR_ABBR_QUARTER "yQ" +#define UDAT_HOUR_MINUTE "hm" +#define UDAT_YEAR "y" +#define UDAT_DAY "d" +#define UDAT_NUM_MONTH_WEEKDAY_DAY "MEd" +#define UDAT_YEAR_NUM_MONTH "yM" +#define UDAT_NUM_MONTH_DAY "Md" +#define UDAT_YEAR_NUM_MONTH_WEEKDAY_DAY "yMEd" +#define UDAT_ABBR_MONTH_WEEKDAY_DAY "MMMEd" +#define UDAT_YEAR_MONTH "yMMMM" +#define UDAT_YEAR_ABBR_MONTH "yMMM" +#define UDAT_MONTH_DAY "MMMMd" +#define UDAT_ABBR_MONTH_DAY "MMMd" +#define UDAT_MONTH_WEEKDAY_DAY "MMMMEEEEd" +#define UDAT_YEAR_ABBR_MONTH_WEEKDAY_DAY "yMMMEd" +#define UDAT_YEAR_MONTH_WEEKDAY_DAY "yMMMMEEEEd" +#define UDAT_YEAR_MONTH_DAY "yMMMMd" +#define UDAT_YEAR_ABBR_MONTH_DAY "yMMMd" +#define UDAT_YEAR_NUM_MONTH_DAY "yMd" +#define UDAT_NUM_MONTH "M" +#define UDAT_ABBR_MONTH "MMM" +#define UDAT_MONTH "MMMM" +#define UDAT_HOUR_MINUTE_GENERIC_TZ "hmv" +#define UDAT_HOUR_MINUTE_TZ "hmz" +#define UDAT_HOUR "h" +#define UDAT_HOUR_GENERIC_TZ "hv" +#define UDAT_HOUR_TZ "hz" + /** * FieldPosition and UFieldPosition selectors for format fields diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp index e1a17d97b5f..4f1b5c86313 100644 --- a/icu4c/source/test/intltest/dtifmtts.cpp +++ b/icu4c/source/test/intltest/dtifmtts.cpp @@ -57,7 +57,7 @@ void DateIntervalFormatTest::testAPI() { UErrorCode status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with default locale and skeleton"); - DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_LONG_FORMAT, status); + DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, status); if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + default locale) - exitting"); return; @@ -71,7 +71,7 @@ void DateIntervalFormatTest::testAPI() { status = U_ZERO_ERROR; logln("Testing DateIntervalFormat create instance with given locale and skeleton"); - dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_LONG_FORMAT, Locale::getJapanese(), status); + dtitvfmt = DateIntervalFormat::createInstance(UDAT_YEAR_MONTH_DAY, Locale::getJapanese(), status); if(U_FAILURE(status)) { dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + locale) - exitting"); return; @@ -375,11 +375,11 @@ void DateIntervalFormatTest::expect(const char** data, int32_t data_length, ec = U_ZERO_ERROR; DateIntervalInfo* dtitvinf = new DateIntervalInfo(ec); dtitvinf->setFallbackIntervalPattern("{0} --- {1}"); - dtitvinf->setIntervalPattern(YEAR_MONTH_DAY_MEDIUM_FORMAT, UCAL_MONTH, "yyyy MMM d - MMM y",ec); + dtitvinf->setIntervalPattern(UDAT_YEAR_ABBR_MONTH_DAY, UCAL_MONTH, "yyyy MMM d - MMM y",ec); if (!assertSuccess("DateIntervalInfo::setIntervalPattern", ec)) return; - dtitvinf->setIntervalPattern(YEAR_MONTH_DAY_MEDIUM_FORMAT, UCAL_HOUR_OF_DAY, "yyyy MMM d HH:mm - HH:mm", ec); + dtitvinf->setIntervalPattern(UDAT_YEAR_ABBR_MONTH_DAY, UCAL_HOUR_OF_DAY, "yyyy MMM d HH:mm - HH:mm", ec); if (!assertSuccess("DateIntervalInfo::setIntervalPattern", ec)) return; - DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_MEDIUM_FORMAT, loc, dtitvinf, ec); + DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(UDAT_YEAR_ABBR_MONTH_DAY, loc, dtitvinf, ec); if (!assertSuccess("createInstance(skeleton,dtitvinf)", ec)) return; FieldPosition pos=0; dtitvfmt->format(&dtitv, str.remove(), pos, ec);