whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: fix standaloneMonthName implementation for system locale 

macOS has specific formatters for the standalone month names, so use
them.

Change-Id: Ic4ad547c7d1c29d71c85f60301acd5a5f0f263d2
Fixes: QTBUG-86191
Pick-to: 5.15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Evgeniy Dushistov <dushistov@mail.ru>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Volker Hilsheimer 2020-08-26 14:13:08 +02:00
parent bba0bdb35c
commit 062d283184
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/text/qlocale_mac.mm
View File

@ -81,7 +81,7 @@ static QString getMacLocaleName()
return result;
}
static QString macMonthName(int month, bool short_format)
static QString macMonthName(int month, QSystemLocale::QueryType type)
{
month -= 1;
if (month < 0 || month > 11)
@ -90,10 +90,28 @@ static QString macMonthName(int month, bool short_format)
QCFType<CFDateFormatterRef> formatter
= CFDateFormatterCreate(0, QCFType<CFLocaleRef>(CFLocaleCopyCurrent()),
kCFDateFormatterNoStyle, kCFDateFormatterNoStyle);
CFDateFormatterKey formatterType;
switch (type) {
case QSystemLocale::MonthNameLong:
formatterType = kCFDateFormatterMonthSymbols;
break;
case QSystemLocale::MonthNameShort:
formatterType = kCFDateFormatterShortMonthSymbols;
break;
case QSystemLocale::StandaloneMonthNameLong:
formatterType = kCFDateFormatterStandaloneMonthSymbols;
break;
case QSystemLocale::StandaloneMonthNameShort:
formatterType = kCFDateFormatterShortStandaloneMonthSymbols;
break;
default:
qWarning("macMonthName: Unsupported query type %d", type);
return QString();
}
QCFType<CFArrayRef> values
= static_cast<CFArrayRef>(CFDateFormatterCopyProperty(formatter,
short_format ? kCFDateFormatterShortMonthSymbols
: kCFDateFormatterMonthSymbols));
= static_cast<CFArrayRef>(CFDateFormatterCopyProperty(formatter, formatterType));
if (values != 0) {
CFStringRef cfstring = static_cast<CFStringRef>(CFArrayGetValueAtIndex(values, month));
return QString::fromCFString(cfstring);
@ -434,7 +452,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
case MonthNameShort:
case StandaloneMonthNameLong:
case StandaloneMonthNameShort:
return macMonthName(in.toInt(), (type == MonthNameShort || type == StandaloneMonthNameShort));
return macMonthName(in.toInt(), type);
case DateToStringShort:
case DateToStringLong:
return macDateToString(in.toDate(), (type == DateToStringShort));