Skip to content

Commit 32d9a90

Browse files
committed
ICU-23102 Simplify calendar code
1 parent cd35712 commit 32d9a90

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

icu4c/source/i18n/ethpccal.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,9 @@ EthiopicAmeteAlemCalendar::handleGetExtendedYear(UErrorCode& status)
174174
void
175175
EthiopicAmeteAlemCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status)
176176
{
177-
int32_t eyear, month, day;
178-
jdToCE(julianDay, getJDEpochOffset(), eyear, month, day, status);
179-
if (U_FAILURE(status)) return;
180-
181-
internalSet(UCAL_EXTENDED_YEAR, eyear);
177+
EthiopicCalendar::handleComputeFields(julianDay, status);
182178
internalSet(UCAL_ERA, AMETE_ALEM);
183-
internalSet(UCAL_YEAR, eyear + AMETE_MIHRET_DELTA);
184-
internalSet(UCAL_MONTH, month);
185-
internalSet(UCAL_ORDINAL_MONTH, month);
186-
internalSet(UCAL_DATE, day);
187-
internalSet(UCAL_DAY_OF_YEAR, (30 * month) + day);
179+
internalSet(UCAL_YEAR, internalGet(UCAL_EXTENDED_YEAR, 1) + AMETE_MIHRET_DELTA);
188180
}
189181

190182
int32_t

0 commit comments

Comments
 (0)