From 561913713054337c657c953d662bf3a85cd5698c Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 14 Aug 2007 18:31:26 +0000 Subject: [PATCH] ICU-3704 Fix DAY_OF_WEEK_IN_MONTH least maximum value in GregorianCalendar. Also merged field limit bug fixes from ICU4J to ICU4C. X-SVN-Rev: 22379 --- icu4c/source/i18n/gregocal.cpp | 4 ++-- icu4c/source/i18n/hebrwcal.cpp | 4 ++-- icu4c/source/i18n/indiancal.cpp | 4 ++-- icu4c/source/i18n/islamcal.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/icu4c/source/i18n/gregocal.cpp b/icu4c/source/i18n/gregocal.cpp index a6459f821c1..ba342505d5b 100644 --- a/icu4c/source/i18n/gregocal.cpp +++ b/icu4c/source/i18n/gregocal.cpp @@ -84,7 +84,7 @@ static const int32_t kGregorianCalendarLimits[UCAL_FIELD_COUNT][4] = { { 1, 1, 28, 31 }, // DAY_OF_MONTH { 1, 1, 365, 366 }, // DAY_OF_YEAR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// DAY_OF_WEEK - { -1, -1, 4, 6 }, // DAY_OF_WEEK_IN_MONTH + { -1, -1, 4, 5 }, // DAY_OF_WEEK_IN_MONTH {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// AM_PM {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// HOUR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// HOUR_OF_DAY @@ -113,7 +113,7 @@ static const int32_t kGregorianCalendarLimits[UCAL_FIELD_COUNT][4] = { * DAY_OF_MONTH 1 1 28 31 * DAY_OF_YEAR 1 1 365 366 * DAY_OF_WEEK 1 1 7 7 -* DAY_OF_WEEK_IN_MONTH -1 -1 4 6 +* DAY_OF_WEEK_IN_MONTH -1 -1 4 5 * AM_PM 0 0 1 1 * HOUR 0 0 11 11 * HOUR_OF_DAY 0 0 23 23 diff --git a/icu4c/source/i18n/hebrwcal.cpp b/icu4c/source/i18n/hebrwcal.cpp index 300d79f83aa..b3ac7bc7fe7 100644 --- a/icu4c/source/i18n/hebrwcal.cpp +++ b/icu4c/source/i18n/hebrwcal.cpp @@ -41,11 +41,11 @@ static const int32_t LIMITS[UCAL_FIELD_COUNT][4] = { { 1, 1, 5000000, 5000000 }, // YEAR { 0, 0, 12, 12 }, // MONTH { 1, 1, 51, 56 }, // WEEK_OF_YEAR - { 0, 0, 5, 6 }, // WEEK_OF_MONTH + { 0, 0, 4, 6 }, // WEEK_OF_MONTH { 1, 1, 29, 30 }, // DAY_OF_MONTH { 1, 1, 353, 385 }, // DAY_OF_YEAR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // DAY_OF_WEEK - { -1, -1, 4, 6 }, // DAY_OF_WEEK_IN_MONTH + { -1, -1, 5, 5 }, // DAY_OF_WEEK_IN_MONTH {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1/* */}, // AM_PM {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR_OF_DAY diff --git a/icu4c/source/i18n/indiancal.cpp b/icu4c/source/i18n/indiancal.cpp index ff4dcf3eca0..0d948cb520e 100644 --- a/icu4c/source/i18n/indiancal.cpp +++ b/icu4c/source/i18n/indiancal.cpp @@ -61,11 +61,11 @@ static const int32_t LIMITS[UCAL_FIELD_COUNT][4] = { { 1, 1, 5000000, 5000000 }, // YEAR { 0, 0, 11, 11 }, // MONTH { 1, 1, 52, 53 }, // WEEK_OF_YEAR - { 0, 0, 5, 6 }, // WEEK_OF_MONTH + { 0, 0, 4, 6 }, // WEEK_OF_MONTH { 1, 1, 30, 31 }, // DAY_OF_MONTH { 1, 1, 365, 366 }, // DAY_OF_YEAR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // DAY_OF_WEEK - { -1, -1, 4, 6 }, // DAY_OF_WEEK_IN_MONTH + { -1, -1, 5, 5 }, // DAY_OF_WEEK_IN_MONTH {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // AM_PM {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR_OF_DAY diff --git a/icu4c/source/i18n/islamcal.cpp b/icu4c/source/i18n/islamcal.cpp index 83e0204ef64..a6d093a94eb 100644 --- a/icu4c/source/i18n/islamcal.cpp +++ b/icu4c/source/i18n/islamcal.cpp @@ -144,12 +144,12 @@ static const int32_t LIMITS[UCAL_FIELD_COUNT][4] = { { 0, 0, 0, 0 }, // ERA { 1, 1, 5000000, 5000000 }, // YEAR { 0, 0, 11, 11 }, // MONTH - { 1, 1, 51, 52 }, // WEEK_OF_YEAR - { 0, 0, 5, 6 }, // WEEK_OF_MONTH + { 1, 1, 50, 51 }, // WEEK_OF_YEAR + { 0, 0, 4, 6 }, // WEEK_OF_MONTH { 1, 1, 29, 30 }, // DAY_OF_MONTH { 1, 1, 354, 355 }, // DAY_OF_YEAR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // DAY_OF_WEEK - { -1, -1, 4, 5 }, // DAY_OF_WEEK_IN_MONTH + { -1, -1, 5, 5 }, // DAY_OF_WEEK_IN_MONTH {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // AM_PM {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR {/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1}, // HOUR_OF_DAY