From dcd5aa83da6af2ac65a30325d8b9295a1853f0e0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 3 May 2019 17:55:33 +0300
Subject: [PATCH] Fixed choosing of plural when number should be shortened.

---
 Telegram/SourceFiles/lang/lang_tag.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index a4b820605..0569cf9a2 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -914,7 +914,7 @@ int NonZeroPartToInt(QString value) {
 		: (value.isEmpty() ? 0 : value.toInt());
 }
 
-inline QString FormatCountToShort(int64 number) {
+inline QString FormatCountToShort(int64 &number) {
 	const auto abs = std::abs(number);
 	auto result = QString();
 	const auto shorten = [&](int64 divider, char multiplier) {
@@ -926,6 +926,9 @@ inline QString FormatCountToShort(int64 number) {
 		} else {
 			result += multiplier;
 		}
+		// Update given number.
+		// E.g. 12345 will be 12000.
+		number = rounded * divider;
 	};
 	if (abs >= 1'000'000) {
 		shorten(1'000'000, 'M');
@@ -941,8 +944,18 @@ PluralResult Plural(
 	ushort keyBase,
 	float64 value,
 	PluralType type) {
+
+	// To correctly select a shift for PluralType::Short
+	// we must first round the number.
+	int64 shortenedValue = 0;
+	auto shortenedNumberString = QString();
+	if (type == PluralType::Short) {
+		shortenedValue = qRound(value);
+		shortenedNumberString = FormatCountToShort(shortenedValue);
+	}
+
 	// Simplified.
-	const auto n = qAbs(value);
+	const auto n = std::abs(shortenedValue ? float64(shortenedValue) : value);
 	const auto i = qFloor(n);
 	const auto integer = (qCeil(n) == i);
 	const auto formatted = integer ? QString() : FormatDouble(n);
@@ -967,7 +980,7 @@ PluralResult Plural(
 	if (integer) {
 		const auto round = qRound(value);
 		if (type == PluralType::Short) {
-			return { string, FormatCountToShort(round) };
+			return { string, shortenedNumberString };
 		} else if (type == PluralType::DecimalSeparation) {
 			return { string, QString("%L1").arg(round) };
 		}