Cocoa: Get the right zero digit for the locale

Change-Id: Ic23e541e1b12b3c94f8d191cb8fb0f76086b69a5 Reviewed-by: Tor Arne Vestbø <[email protected]> Reviewed-by: Thiago Macieira <[email protected]>
zhangzhuo520 · May 2, 2019 · 047633a · 047633a
1 parent 513e29a
commit 047633a
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm
@@ -332,6 +332,17 @@ static QString macCurrencySymbol(QLocale::CurrencySymbolFormat format)
     return QString();
 }
 
+static QString macZeroDigit()
+{
+    QCFType<CFLocaleRef> locale = CFLocaleCopyCurrent();
+    QCFType<CFNumberFormatterRef> numberFormatter =
+            CFNumberFormatterCreate(nullptr, locale, kCFNumberFormatterNoStyle);
+    static const int zeroDigit = 0;
+    QCFType<CFStringRef> value = CFNumberFormatterCreateStringWithValue(nullptr, numberFormatter,
+                                                                        kCFNumberIntType, &zeroDigit);
+    return QString::fromCFString(value);
+}
+
 #ifndef QT_NO_SYSTEMLOCALE
 static QString macFormatCurrency(const QSystemLocale::CurrencyToStringArgument &arg)
 {
@@ -437,8 +448,9 @@ static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &
 
     case NegativeSign:
     case PositiveSign:
-    case ZeroDigit:
         break;
+    case ZeroDigit:
+        return QVariant(macZeroDigit());
 
     case MeasurementSystem:
         return QVariant(static_cast<int>(macMeasurementSystem()));