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

If full time format, don't abbreviate the time zone.

This commit is contained in:
John Scipione 2012-04-09 20:49:35 -04:00
parent 44fcb75e77
commit 40b6c14db7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kits/locale/FormattingConventions.cpp
View File

@ -465,7 +465,7 @@ BFormattingConventions::GetTimeFormat(BTimeFormatStyle style,
icuString.toUTF8(stringConverter);
int8 use24HourClock = fExplicitUse24HourClock != CLOCK_HOURS_UNSET
? fExplicitUse24HourClock : fCachedUse24HourClock;
? fExplicitUse24HourClock : fCachedUse24HourClock;
if (use24HourClock != CLOCK_HOURS_UNSET) {
// adjust to 12/24-hour clock as requested
bool localeUses24HourClock = !FormatUsesAmPm(outFormat);
@ -478,8 +478,10 @@ BFormattingConventions::GetTimeFormat(BTimeFormatStyle style,
}
}
// use abbreviated timezone in short timezone format
CoerceFormatToAbbreviatedTimezone(outFormat);
if (style != B_FULL_TIME_FORMAT) {
// use abbreviated timezone in short timezone format
CoerceFormatToAbbreviatedTimezone(outFormat);
}
fCachedTimeFormats[style] = outFormat;