organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 05:55:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-22446 Fix incorrect Hebrew ORDINAL MONTH bug

Browse source
This commit is contained in:
Frank Tang 2023-07-27 17:03:02 -07:00 • committed by Frank Yung-Fong Tang
parent 73b61ceece
commit 19bac42f98
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/i18n/calendar.cpp
View file

@ -1827,7 +1827,6 @@ void Calendar::roll(UCalendarDateFields field, int32_t amount, UErrorCode& statu
}
set(field, newYear);
pinField(UCAL_MONTH,status);
pinField(UCAL_ORDINAL_MONTH,status);
pinField(UCAL_DAY_OF_MONTH,status);
return;
}
@ -1836,7 +1835,6 @@ void Calendar::roll(UCalendarDateFields field, int32_t amount, UErrorCode& statu
// Rolling the year can involve pinning the DAY_OF_MONTH.
set(field, internalGet(field) + amount);
pinField(UCAL_MONTH,status);
pinField(UCAL_ORDINAL_MONTH,status);
pinField(UCAL_DAY_OF_MONTH,status);
return;

2
icu4c/source/i18n/hebrwcal.cpp
View file

@ -777,7 +777,7 @@ int32_t HebrewCalendar::internalGetMonth() const {
HebrewCalendar *nonConstThis = (HebrewCalendar*)this; // cast away const
int32_t year = nonConstThis->handleGetExtendedYear();
return ordinalMonth + ((isLeapYear(year) && (ordinalMonth > ADAR_1)) ? 1: 0);
return ordinalMonth + (((!isLeapYear(year)) && (ordinalMonth > ADAR_1)) ? 1: 0);
}
return Calendar::internalGetMonth();
}

2
icu4c/source/test/intltest/caltest.cpp
View file

@ -5157,7 +5157,7 @@ void CalendarTest::TestHebrewCalendarOrdinalMonthSet() {
VerifyMonth(this, "cc2", cc2.getAlias(), icu::HebrewCalendar::ADAR, 6, false, "M06");
VerifyMonth(this, "cc3", cc3.getAlias(), icu::HebrewCalendar::ADAR, 6, false, "M06");
cc1->set(UCAL_ORDINAL_MONTH, 6);
cc1->set(UCAL_ORDINAL_MONTH, 7);
cc2->setTemporalMonthCode("M07", status);
if (failure(status, "setTemporalMonthCode failure")) return;
cc3->set(UCAL_MONTH, icu::HebrewCalendar::NISAN);