organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 01:42:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10884 Comments from roubert.

Browse source 
X-SVN-Rev: 35882
This commit is contained in:
Travis Keep 2014-06-17 16:34:46 +00:00
parent 49c0734f6a
commit 7bf9b7dce1
4 changed files with 31 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
icu4c/source/i18n/reldatefmt.cpp
View file

@ -53,19 +53,6 @@ U_CDECL_END
U_NAMESPACE_BEGIN
static int32_t getStyleIndex(UDateRelativeDateTimeFormatterStyle style) {
switch (style) {
case UDAT_STYLE_LONG:
return 0;
case UDAT_STYLE_SHORT:
return 1;
case UDAT_STYLE_NARROW:
return 2;
default:
return 0;
}
}
// RelativeDateTimeFormatter specific data for a single locale
class RelativeDateTimeCacheData: public SharedObject {
public:
@ -356,20 +343,20 @@ static void addTimeUnits(
addTimeUnit(
resource,
path,
cacheData.relativeUnits[0][relativeUnit],
cacheData.absoluteUnits[0][absoluteUnit],
cacheData.relativeUnits[UDAT_STYLE_LONG][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_LONG][absoluteUnit],
status);
addTimeUnit(
resource,
pathShort,
cacheData.relativeUnits[1][relativeUnit],
cacheData.absoluteUnits[1][absoluteUnit],
cacheData.relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_SHORT][absoluteUnit],
status);
addTimeUnit(
resource,
pathNarrow,
cacheData.relativeUnits[2][relativeUnit],
cacheData.absoluteUnits[2][absoluteUnit],
cacheData.relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
cacheData.absoluteUnits[UDAT_STYLE_NARROW][absoluteUnit],
status);
}
@ -382,17 +369,17 @@ static void initRelativeUnits(
initRelativeUnit(
resource,
path,
relativeUnits[0][relativeUnit],
relativeUnits[UDAT_STYLE_LONG][relativeUnit],
status);
initRelativeUnit(
resource,
pathShort,
relativeUnits[1][relativeUnit],
relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
status);
initRelativeUnit(
resource,
pathNarrow,
relativeUnits[2][relativeUnit],
relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
status);
}
@ -406,23 +393,23 @@ static void addWeekDays(
addWeekDay(
resource,
path,
daysOfWeek[0],
daysOfWeek[UDAT_STYLE_LONG],
absoluteUnit,
absoluteUnits[0],
absoluteUnits[UDAT_STYLE_LONG],
status);
addWeekDay(
resource,
pathShort,
daysOfWeek[1],
daysOfWeek[UDAT_STYLE_SHORT],
absoluteUnit,
absoluteUnits[1],
absoluteUnits[UDAT_STYLE_SHORT],
status);
addWeekDay(
resource,
pathNarrow,
daysOfWeek[2],
daysOfWeek[UDAT_STYLE_NARROW],
absoluteUnit,
absoluteUnits[2],
absoluteUnits[UDAT_STYLE_NARROW],
status);
}
@ -479,33 +466,33 @@ static UBool loadUnitData(
getStringWithFallback(
resource,
"fields/second/relative/0",
cacheData.absoluteUnits[0][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
cacheData.absoluteUnits[UDAT_STYLE_LONG][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
status);
getStringWithFallback(
resource,
"fields/second-short/relative/0",
cacheData.absoluteUnits[1][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
cacheData.absoluteUnits[UDAT_STYLE_SHORT][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
status);
getStringWithFallback(
resource,
"fields/second-narrow/relative/0",
cacheData.absoluteUnits[2][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
cacheData.absoluteUnits[UDAT_STYLE_NARROW][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
status);
UnicodeString daysOfWeek[3][7];
UnicodeString daysOfWeek[UDAT_STYLE_COUNT][7];
readDaysOfWeek(
resource,
"calendar/gregorian/dayNames/stand-alone/wide",
daysOfWeek[0],
daysOfWeek[UDAT_STYLE_LONG],
status);
readDaysOfWeek(
resource,
"calendar/gregorian/dayNames/stand-alone/short",
daysOfWeek[1],
daysOfWeek[UDAT_STYLE_SHORT],
status);
readDaysOfWeek(
resource,
"calendar/gregorian/dayNames/stand-alone/narrow",
daysOfWeek[2],
daysOfWeek[UDAT_STYLE_NARROW],
status);
addWeekDays(
resource,
@ -796,7 +783,7 @@ UnicodeString& RelativeDateTimeFormatter::format(
int32_t bFuture = direction == UDAT_DIRECTION_NEXT ? 1 : 0;
FieldPosition pos(FieldPosition::DONT_CARE);
if (fOptBreakIterator == NULL) {
return fCache->relativeUnits[getStyleIndex(fStyle)][unit][bFuture].format(
return fCache->relativeUnits[fStyle][unit][bFuture].format(
quantity,
**fNumberFormat,
**fPluralRules,
@ -805,7 +792,7 @@ UnicodeString& RelativeDateTimeFormatter::format(
status);
}
UnicodeString result;
fCache->relativeUnits[getStyleIndex(fStyle)][unit][bFuture].format(
fCache->relativeUnits[fStyle][unit][bFuture].format(
quantity,
**fNumberFormat,
**fPluralRules,
@ -827,9 +814,9 @@ UnicodeString& RelativeDateTimeFormatter::format(
return appendTo;
}
if (fOptBreakIterator == NULL) {
return appendTo.append(fCache->absoluteUnits[getStyleIndex(fStyle)][unit][direction]);
return appendTo.append(fCache->absoluteUnits[fStyle][unit][direction]);
}
UnicodeString result(fCache->absoluteUnits[getStyleIndex(fStyle)][unit][direction]);
UnicodeString result(fCache->absoluteUnits[fStyle][unit][direction]);
adjustForContext(result);
return appendTo.append(result);
}

3
icu4c/source/i18n/sharedbreakiterator.cpp
View file

@ -13,6 +13,9 @@
U_NAMESPACE_BEGIN
SharedBreakIterator::SharedBreakIterator(
BreakIterator *biToAdopt) : ptr(biToAdopt) { }
SharedBreakIterator::~SharedBreakIterator() {
delete ptr;
}

2
icu4c/source/i18n/sharedbreakiterator.h
View file

@ -26,7 +26,7 @@ class BreakIterator;
// these shared break iterators must never be exposed outside of that class.
class U_I18N_API SharedBreakIterator : public SharedObject {
public:
SharedBreakIterator(BreakIterator *biToAdopt) : ptr(biToAdopt) { }
SharedBreakIterator(BreakIterator *biToAdopt);
virtual ~SharedBreakIterator();
BreakIterator *get() const { return ptr; }

2
icu4c/source/i18n/unicode/reldatefmt.h
View file

@ -55,7 +55,7 @@ typedef enum UDateRelativeDateTimeFormatterStyle {
* @draft ICU 54
*/
UDAT_STYLE_COUNT
};
} UDateRelativeDateTimeFormatterStyle;
/**
* Represents the unit for formatting a relative date. e.g "in 5 days"