Locale-aware number formatting and parsing in numeric input controls

framework/global/dataformatter.cpp

@@ -21,6 +21,10 @@
  */
 #include "dataformatter.h"
 
+#include <QLocale>
+
+#include <cmath>
+
 #include "translation.h"
 #include "types/datetime.h"
 
@@ -36,6 +40,50 @@ String DataFormatter::formatReal(double val, int prec)
     return String::number(val, prec);
 }
 
+String DataFormatter::formatLocalizedReal(double val, int prec, bool omitGroupSeparator)
+{
+    QLocale locale;
+    if (omitGroupSeparator) {
+        locale.setNumberOptions(locale.numberOptions() | QLocale::OmitGroupSeparator);
+    }
+
+    QString str = locale.toString(val, 'f', prec);
+    if (prec <= 0) {
+        return String::fromQString(str);
+    }
+
+    // The zero digit and the separator can each be several UTF-16 code units
+    // (non-Latin digits, multi-character separators), so match whole tokens
+    const QString decSep = locale.decimalPoint().isEmpty() ? QStringLiteral(".") : locale.decimalPoint();
+    const QString zero = locale.zeroDigit().isEmpty() ? QStringLiteral("0") : locale.zeroDigit();
+
+    const int decPos = str.indexOf(decSep);
+    if (decPos == -1) {
+        return String::fromQString(str);
+    }
+
+    const int fracStart = decPos + decSep.size();
+    while (str.size() > fracStart && str.endsWith(zero)) {
+        str.chop(zero.size());
+    }
+    if (str.size() == fracStart) {
+        str.chop(decSep.size());
+    }
+
+    return String::fromQString(str);
+}
+
+int DataFormatter::decimalsForStep(double step, int maxDecimals)
+{
+    int decimals = 0;
+    double scaled = std::abs(step);
+    while (decimals < maxDecimals && std::abs(scaled - std::round(scaled)) > 1e-9 * std::max(1.0, scaled)) {
+        scaled *= 10.0;
+        ++decimals;
+    }
+    return decimals;
+}
+
 String DataFormatter::formatTimeSince(const Date& date)
 {
     Date currentDate = DateTime::currentDateTime().date();
@@ -85,19 +133,19 @@ String DataFormatter::formatFileSize(size_t size)
     if (size >= 1024 * 1024 * 1024) {
         double gb = double(size) / (1024 * 1024 * 1024);
         //: Abbreviation of "gigabyte", used to indicate file size
-        return mtrc("global", "%1 GB", "gigabyte").arg(formatReal(gb, 2));
+        return mtrc("global", "%1 GB", "gigabyte").arg(formatLocalizedReal(gb, 2));
     }
 
     if (size >= 1024 * 1024) {
         double mb = double(size) / (1024 * 1024);
         //: Abbreviation of "megabyte", used to indicate file size
-        return mtrc("global", "%1 MB", "megabyte").arg(formatReal(mb, 1));
+        return mtrc("global", "%1 MB", "megabyte").arg(formatLocalizedReal(mb, 1));
     }
 
     if (size >= 1024) {
         double kb = double(size) / 1024;
         //: Abbreviation of "kilobyte", used to indicate file size
-        return mtrc("global", "%1 KB", "kilobyte").arg(formatReal(kb, 0));
+        return mtrc("global", "%1 KB", "kilobyte").arg(formatLocalizedReal(kb, 0));
     }
 
     //: Used to indicate file size. Ideally, keep the translation short; feel free to use an abbreviation.

framework/global/dataformatter.h

@@ -32,6 +32,14 @@ class DataFormatter
 public:
     static double roundDouble(const double& val, const int decimals = 2);
     static String formatReal(double val, int prec = 2);
+
+    //! Formats in the default locale, trimming trailing zeros. Editable fields
+    //! pass omitGroupSeparator, as grouped text cannot be typed back.
+    static String formatLocalizedReal(double val, int prec = 2, bool omitGroupSeparator = false);
+
+    //! Fractional digits needed to show a step, capped at maxDecimals
+    static int decimalsForStep(double step, int maxDecimals = 6);
+
     static String formatTimeSince(const Date& date);
     static String formatFileSize(size_t size);
 };

framework/interactive/qml/Muse/Interactive/ProgressDialog.qml

@@ -89,7 +89,7 @@ StyledDialogView {
             value: model.value
             to: model.to
 
-            progressStatus: model.to != 0 ? Math.round(model.value * 100 / model.to) + "%" : "0%"
+            progressStatus: (model.to != 0 ? Math.round(model.value * 100 / model.to) : 0).toLocaleString(Qt.locale(), 'f', 0) + Qt.locale().percent
         }
 
         FlatButton {

framework/languages/ilanguagesconfiguration.h

@@ -39,6 +39,9 @@ class ILanguagesConfiguration : MODULE_GLOBAL_INTERFACE
     virtual ValCh<QString> currentLanguageCode() const = 0;
     virtual void setCurrentLanguageCode(const QString& languageCode) const = 0;
 
+    virtual ValCh<QString> numberFormatSource() const = 0;
+    virtual void setNumberFormatSource(const QString& source) const = 0;
+
     virtual QUrl languagesUpdateUrl() const = 0;
     virtual QUrl languageFileServerUrl(const QString& languageCode) const = 0;
 

framework/languages/internal/languagesconfiguration.cpp

@@ -34,6 +34,7 @@ using namespace muse;
 using namespace muse::languages;
 
 static const Settings::Key LANGUAGE_KEY("languages", "language");
+static const Settings::Key NUMBER_FORMAT_SOURCE_KEY("languages", "numberFormatSource");
 
 void LanguagesConfiguration::init()
 {
@@ -43,6 +44,11 @@ void LanguagesConfiguration::init()
     settings()->valueChanged(LANGUAGE_KEY).onReceive(nullptr, [this](const Val& val) {
         m_currentLanguageCodeChanged.send(val.toQString());
     });
+
+    settings()->setDefaultValue(NUMBER_FORMAT_SOURCE_KEY, Val(SYSTEM_NUMBER_FORMAT_SOURCE.toStdString()));
+    settings()->valueChanged(NUMBER_FORMAT_SOURCE_KEY).onReceive(nullptr, [this](const Val& val) {
+        m_numberFormatSourceChanged.send(val.toQString());
+    });
 }
 
 ValCh<QString> LanguagesConfiguration::currentLanguageCode() const
@@ -60,6 +66,20 @@ void LanguagesConfiguration::setCurrentLanguageCode(const QString& languageCode)
     settings()->setSharedValue(LANGUAGE_KEY, value);
 }
 
+ValCh<QString> LanguagesConfiguration::numberFormatSource() const
+{
+    ValCh<QString> result;
+    result.ch = m_numberFormatSourceChanged;
+    result.val = settings()->value(NUMBER_FORMAT_SOURCE_KEY).toQString();
+
+    return result;
+}
+
+void LanguagesConfiguration::setNumberFormatSource(const QString& source) const
+{
+    settings()->setSharedValue(NUMBER_FORMAT_SOURCE_KEY, Val(source.toStdString()));
+}
+
 QUrl LanguagesConfiguration::languagesUpdateUrl() const
 {
     return QUrl(m_config.value("server_url").toQString() + "details.json");

framework/languages/internal/languagesconfiguration.h

@@ -42,6 +42,9 @@ class LanguagesConfiguration : public ILanguagesConfiguration, public Contextabl
     ValCh<QString> currentLanguageCode() const override;
     void setCurrentLanguageCode(const QString& languageCode) const override;
 
+    ValCh<QString> numberFormatSource() const override;
+    void setNumberFormatSource(const QString& source) const override;
+
     QUrl languagesUpdateUrl() const override;
     QUrl languageFileServerUrl(const QString& languageCode) const override;
 
@@ -58,6 +61,7 @@ class LanguagesConfiguration : public ILanguagesConfiguration, public Contextabl
 private:
     Config m_config;
     async::Channel<QString> m_currentLanguageCodeChanged;
+    async::Channel<QString> m_numberFormatSourceChanged;
 };
 }
 

framework/languages/internal/languagesservice.cpp

@@ -73,6 +73,12 @@ void LanguagesService::init()
     m_inited = true;
 }
 
+void LanguagesService::applyNumberFormat(const QLocale& languageLocale)
+{
+    const bool useSystem = configuration()->numberFormatSource().val == SYSTEM_NUMBER_FORMAT_SOURCE;
+    QLocale::setDefault(useSystem ? QLocale::system() : languageLocale);
+}
+
 const LanguagesHash& LanguagesService::languages() const
 {
     return m_languagesHash;
@@ -215,8 +221,9 @@ void LanguagesService::setCurrentLanguage(const QString& languageCode)
 
     installTranslatorsForLanguage(lang);
 
+    // Layout direction follows the language; the number format follows the setting
     QLocale locale(lang.code);
-    QLocale::setDefault(locale);
+    applyNumberFormat(locale);
     qGuiApp->setLayoutDirection(locale.textDirection());
 
     lang.direction = locale.textDirection();

framework/languages/internal/languagesservice.h

@@ -34,6 +34,7 @@
 #include "progress.h"
 
 class QJsonObject;
+class QLocale;
 class QTranslator;
 
 namespace muse::languages {
@@ -67,6 +68,7 @@ class LanguagesService : public ILanguagesService, public Contextable, public as
     void loadLanguages();
 
     void setCurrentLanguage(const QString& languageCode);
+    void applyNumberFormat(const QLocale& languageLocale);
     QString effectiveLanguageCode(QString languageCode) const;
 
     Ret loadLanguage(Language& lang);

framework/languages/languagestypes.h

@@ -32,6 +32,10 @@ namespace muse::languages {
 const QString SYSTEM_LANGUAGE_CODE = "system";
 const QString PLACEHOLDER_LANGUAGE_CODE = "en@placeholder";
 
+//! Where the number format comes from: the OS region, or the UI language
+const QString SYSTEM_NUMBER_FORMAT_SOURCE = "system";
+const QString LANGUAGE_NUMBER_FORMAT_SOURCE = "language";
+
 using LanguageFilesMap = QMap<QString /*resourceName*/, io::path_t>;
 
 struct Language

framework/stubs/languages/languagesconfigurationstub.cpp

@@ -33,6 +33,15 @@ void LanguagesConfigurationStub::setCurrentLanguageCode(const QString&) const
 {
 }
 
+ValCh<QString> LanguagesConfigurationStub::numberFormatSource() const
+{
+    return ValCh<QString>();
+}
+
+void LanguagesConfigurationStub::setNumberFormatSource(const QString&) const
+{
+}
+
 QUrl LanguagesConfigurationStub::languagesUpdateUrl() const
 {
     return QUrl();

framework/stubs/languages/languagesconfigurationstub.h

@@ -31,6 +31,9 @@ class LanguagesConfigurationStub : public ILanguagesConfiguration
     ValCh<QString> currentLanguageCode() const override;
     void setCurrentLanguageCode(const QString& languageCode) const override;
 
+    ValCh<QString> numberFormatSource() const override;
+    void setNumberFormatSource(const QString& source) const override;
+
     QUrl languagesUpdateUrl() const override;
     QUrl languageFileServerUrl(const QString& languageCode) const override;
 

framework/toast/qml/Muse/Toast/ToastProgressBar.qml

@@ -122,7 +122,7 @@ Item {
 
                 font.pixelSize: root.messagePixelSize
 
-                text: Math.min(Math.max(root.progress, 0), 100) + "%"
+                text: Math.min(Math.max(root.progress, 0), 100).toLocaleString(Qt.locale(), 'f', 0) + Qt.locale().percent
             }
         }
     }

framework/ui/tests/CMakeLists.txt

@@ -27,6 +27,7 @@ set(MODULE_TEST_SRC
     ${CMAKE_CURRENT_LIST_DIR}/mocks/mainwindowmock.h
 
     ${CMAKE_CURRENT_LIST_DIR}/navigationcontroller_tests.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/qmldataformatter_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/themeconverter_tests.cpp
     )