diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp index b45fd87c51..99ca5dcb62 100644 --- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp @@ -14,7 +14,7 @@ using EarnInt = Data::EarnInt; constexpr auto kMinorPartLength = 9; constexpr auto kMaxChoppedZero = kMinorPartLength - 2; constexpr auto kZero = QChar('0'); -constexpr auto kDot = QChar('.'); +static const auto DecimalPoint = QLocale().decimalPoint(); QString MajorPart(EarnInt value) { const auto string = QString::number(value); @@ -28,13 +28,13 @@ QString MajorPart(CreditsAmount value) { QString MinorPart(EarnInt value) { if (!value) { - return QString(kDot) + kZero + kZero; + return DecimalPoint + kZero + kZero; } const auto string = QString::number(value); const auto diff = int(string.size()) - kMinorPartLength; const auto result = (diff < 0) - ? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string - : kDot + string.mid(diff); + ? DecimalPoint + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string + : DecimalPoint + string.mid(diff); const auto begin = (result.constData()); const auto end = (begin + result.size()); auto ch = end - 1; @@ -51,7 +51,6 @@ QString MinorPart(EarnInt value) { } QString MinorPart(CreditsAmount value) { - static const auto DecimalPoint = QLocale().decimalPoint(); static const int DecimalPointLength = DecimalPoint.length(); const auto fractional = std::abs(int(value.value() * 100)) % 100; @@ -82,7 +81,7 @@ QString ToUsd( return QString(kApproximately) + QChar('$') - + QString::number( + + QLocale().toString( value.value() * rate, 'f', afterFloat ? afterFloat : 2); diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp index 6241901804..c559a23684 100644 --- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp +++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_tag.h" +#include + namespace Statistic { namespace { @@ -25,7 +27,7 @@ constexpr auto kStep = 5.; static constexpr auto kTooMuch = ChartValue(10'000); return (absoluteValue >= kTooMuch) ? Lang::FormatCountToShort(absoluteValue).string - : QString::number(absoluteValue); + : QLocale().toString(absoluteValue); } } // namespace diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp index cdc8dc29f2..5093766b17 100644 --- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp +++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp @@ -25,7 +25,7 @@ namespace { ? u"0"_q : (absoluteValue >= kTooMuch) ? Lang::FormatCountToShort(absoluteValue).string - : QString::number(absoluteValue); + : QLocale().toString(absoluteValue); } } // namespace