Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix style formatting issue in BTimeUnitFormat, update BDurationFormat accordingly. 

* Issue: BTimeUnitFormat doesn't incorporate style formatting while
formatting a time unit. Format() does take style as an argument but the
style is not used anywhere. So currently the abbreviated style doesn't
work and by default the time unit is formatted to the full style.

* Fix: Move the style flag from BTimeUnitFormat::Format() to the
BTimeUnitFormat constructors and call the relevant icu::TimeUnitFormat
constructor. Map the Haiku defined style unit to the corresponding ICU
unit. Move the style flag from BDurationFormat::Format() to the
BDurationFormat constructors to map the changes in BTimeUnitFormat.

Signed-off-by: Adrien Destugues <pulkomandy@pulkomandy.tk>

Fixes #13508
This commit is contained in:
Akshay Agarwal 2017-05-17 03:46:31 +05:30 committed by Adrien Destugues
parent f286626cd0
commit f5c544b59a
4 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
headers/os/locale/DurationFormat.h
View File

@ -28,9 +28,10 @@ class BDurationFormat : public BFormat {
public:
BDurationFormat(const BLanguage& language,
const BFormattingConventions& conventions,
const BString& separator = ", ");
BDurationFormat(
const BString& separator = ", ");
const BString& separator = ", ",
const time_unit_style style = B_TIME_UNIT_FULL);
BDurationFormat(const BString& separator = ", ",
const time_unit_style style = B_TIME_UNIT_FULL);
BDurationFormat(const BDurationFormat& other);
virtual ~BDurationFormat();
@ -39,8 +40,7 @@ public:
status_t Format(BString& buffer,
const bigtime_t startValue,
const bigtime_t stopValue,
time_unit_style style = B_TIME_UNIT_FULL
const bigtime_t stopValue
) const;
private:

9
headers/os/locale/TimeUnitFormat.h
View File

@ -43,16 +43,17 @@ class BTimeUnitFormat : public BFormat {
typedef BFormat Inherited;
public:
BTimeUnitFormat();
BTimeUnitFormat(const time_unit_style style =
B_TIME_UNIT_FULL);
BTimeUnitFormat(const BLanguage& language,
const BFormattingConventions& conventions);
const BFormattingConventions& conventions,
const time_unit_style style = B_TIME_UNIT_FULL);
BTimeUnitFormat(const BTimeUnitFormat& other);
virtual ~BTimeUnitFormat();
status_t Format(BString& buffer,
const int32 value,
const time_unit_element unit,
time_unit_style style = B_TIME_UNIT_FULL
const time_unit_element unit
) const;
private:

14
src/kits/locale/DurationFormat.cpp
View File

@ -35,11 +35,12 @@ static const UCalendarDateFields skUnitMap[] = {
BDurationFormat::BDurationFormat(const BLanguage& language,
const BFormattingConventions& conventions, const BString& separator)
const BFormattingConventions& conventions,
const BString& separator, const time_unit_style style)
:
Inherited(language, conventions),
fSeparator(separator),
fTimeUnitFormat(language, conventions)
fTimeUnitFormat(language, conventions, style)
{
UErrorCode icuStatus = U_ZERO_ERROR;
fCalendar = new GregorianCalendar(icuStatus);
@ -50,11 +51,12 @@ BDurationFormat::BDurationFormat(const BLanguage& language,
}
BDurationFormat::BDurationFormat(const BString& separator)
BDurationFormat::BDurationFormat(const BString& separator,
const time_unit_style style)
:
Inherited(),
fSeparator(separator),
fTimeUnitFormat()
fTimeUnitFormat(style)
{
UErrorCode icuStatus = U_ZERO_ERROR;
fCalendar = new GregorianCalendar(icuStatus);
@ -118,7 +120,7 @@ BDurationFormat::SetTimeZone(const BTimeZone* timeZone)
status_t
BDurationFormat::Format(BString& buffer, const bigtime_t startValue,
const bigtime_t stopValue, time_unit_style style) const
const bigtime_t stopValue) const
{
UErrorCode icuStatus = U_ZERO_ERROR;
fCalendar->setTime((UDate)startValue / 1000, icuStatus);
@ -139,7 +141,7 @@ BDurationFormat::Format(BString& buffer, const bigtime_t startValue,
else
needSeparator = true;
status_t status = fTimeUnitFormat.Format(buffer, delta,
(time_unit_element)unit, style);
(time_unit_element)unit);
if (status != B_OK)
return status;
}

34
src/kits/locale/TimeUnitFormat.cpp
View File

@ -34,13 +34,26 @@ static const TimeUnit::UTimeUnitFields skUnitMap[] = {
TimeUnit::UTIMEUNIT_SECOND,
};
//maps our unit style to the corresponding ICU unit
static const UTimeUnitFormatStyle kTimeUnitStyleToICU[] = {
UTMUTFMT_ABBREVIATED_STYLE,
UTMUTFMT_FULL_STYLE,
};
BTimeUnitFormat::BTimeUnitFormat()
BTimeUnitFormat::BTimeUnitFormat(const time_unit_style style)
: Inherited()
{
Locale icuLocale(fLanguage.Code());
UErrorCode icuStatus = U_ZERO_ERROR;
fFormatter = new TimeUnitFormat(icuLocale, icuStatus);
if (style != B_TIME_UNIT_ABBREVIATED && style != B_TIME_UNIT_FULL) {
fFormatter = NULL;
fInitStatus = B_BAD_VALUE;
return;
}
fFormatter = new TimeUnitFormat(icuLocale, kTimeUnitStyleToICU[style],
icuStatus);
if (fFormatter == NULL) {
fInitStatus = B_NO_MEMORY;
return;
@ -52,12 +65,20 @@ BTimeUnitFormat::BTimeUnitFormat()
BTimeUnitFormat::BTimeUnitFormat(const BLanguage& language,
const BFormattingConventions& conventions)
const BFormattingConventions& conventions,
const time_unit_style style)
: Inherited(language, conventions)
{
Locale icuLocale(fLanguage.Code());
UErrorCode icuStatus = U_ZERO_ERROR;
fFormatter = new TimeUnitFormat(icuLocale, icuStatus);
if (style != B_TIME_UNIT_ABBREVIATED && style != B_TIME_UNIT_FULL) {
fFormatter = NULL;
fInitStatus = B_BAD_VALUE;
return;
}
fFormatter = new TimeUnitFormat(icuLocale, kTimeUnitStyleToICU[style],
icuStatus);
if (fFormatter == NULL) {
fInitStatus = B_NO_MEMORY;
return;
@ -87,10 +108,9 @@ BTimeUnitFormat::~BTimeUnitFormat()
status_t
BTimeUnitFormat::Format(BString& buffer, const int32 value,
const time_unit_element unit, time_unit_style style) const
const time_unit_element unit) const
{
if (unit < 0 || unit > B_TIME_UNIT_LAST
|| (style != B_TIME_UNIT_ABBREVIATED && style != B_TIME_UNIT_FULL))
if (unit < 0 || unit > B_TIME_UNIT_LAST)
return B_BAD_VALUE;
if (fFormatter == NULL)