AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11223 Make code in relative date format that falls back to short form more readable.

Browse Source 
X-SVN-Rev: 36338
This commit is contained in:
Travis Keep 2014-09-03 22:01:03 +00:00
parent 4db139b786
commit f8598fb484
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
icu4c/source/i18n/reldatefmt.cpp
View File

@ -337,24 +337,25 @@ static void addTimeUnits(
cacheData.relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_SHORT][absoluteUnit],
status);
UErrorCode prevStatus = status;
if (U_FAILURE(status)) {
return;
}
addTimeUnit(
resource,
pathNarrow,
cacheData.relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_NARROW][absoluteUnit],
status);
if (U_FAILURE(prevStatus) || status != U_MISSING_RESOURCE_ERROR) {
return; // no point trying the short-for-narrow hack
if (status == U_MISSING_RESOURCE_ERROR) {
// retry addTimeUnit for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
addTimeUnit(
resource,
pathShort,
cacheData.relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_NARROW][absoluteUnit],
status);
}
// retry addTimeUnit for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
addTimeUnit(
resource,
pathShort,
cacheData.relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_NARROW][absoluteUnit],
status);
}
static void initRelativeUnits(
@ -373,22 +374,23 @@ static void initRelativeUnits(
pathShort,
relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
status);
UErrorCode prevStatus = status;
if (U_FAILURE(status)) {
return;
}
initRelativeUnit(
resource,
pathNarrow,
relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
status);
if (U_FAILURE(prevStatus) || status != U_MISSING_RESOURCE_ERROR) {
return; // no point trying the short-for-narrow hack
if (status == U_MISSING_RESOURCE_ERROR) {
// retry initRelativeUnit for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
initRelativeUnit(
resource,
pathShort,
relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
status);
}
// retry initRelativeUnit for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
initRelativeUnit(
resource,
pathShort,
relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
status);
}
static void addWeekDays(
@ -412,7 +414,9 @@ static void addWeekDays(
absoluteUnit,
absoluteUnits[UDAT_STYLE_SHORT],
status);
UErrorCode prevStatus = status;
if (U_FAILURE(status)) {
return;
}
addWeekDay(
resource,
pathNarrow,
@ -420,18 +424,17 @@ static void addWeekDays(
absoluteUnit,
absoluteUnits[UDAT_STYLE_NARROW],
status);
if (U_FAILURE(prevStatus) || status != U_MISSING_RESOURCE_ERROR) {
return; // no point trying the short-for-narrow hack
if (status == U_MISSING_RESOURCE_ERROR) {
// retry addWeekDay for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
addWeekDay(
resource,
pathShort,
daysOfWeek[UDAT_STYLE_NARROW],
absoluteUnit,
absoluteUnits[UDAT_STYLE_NARROW],
status);
}
// retry addWeekDay for UDAT_STYLE_NARROW using pathShort
status = U_ZERO_ERROR;
addWeekDay(
resource,
pathShort,
daysOfWeek[UDAT_STYLE_NARROW],
absoluteUnit,
absoluteUnits[UDAT_STYLE_NARROW],
status);
}
static UBool loadUnitData(