From 8982a4919279004c39091e2fba90a319ddcf3a13 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 19 Mar 2024 11:04:11 +0400 Subject: [PATCH] Fix repetitive phone formatting. --- Telegram/SourceFiles/ui/text/format_values.cpp | 3 ++- Telegram/SourceFiles/ui/text/format_values.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp index e792e65604..dec5eb312d 100644 --- a/Telegram/SourceFiles/ui/text/format_values.cpp +++ b/Telegram/SourceFiles/ui/text/format_values.cpp @@ -381,13 +381,14 @@ QString FormatImageSizeText(const QSize &size) { + QString::number(size.height()); } -QString FormatPhone(const QString &phone) { +QString FormatPhone(QString phone) { if (phone.isEmpty()) { return QString(); } if (phone.at(0) == '0') { return phone; } + phone = phone.remove(QChar::Space); return Countries::Instance().format({ .phone = (phone.at(0) == '+') ? phone.mid(1) : phone, }).formatted; diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h index abe6739f73..d4ac31b9ea 100644 --- a/Telegram/SourceFiles/ui/text/format_values.h +++ b/Telegram/SourceFiles/ui/text/format_values.h @@ -24,7 +24,7 @@ inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL; [[nodiscard]] QString FormatGifAndSizeText(qint64 size); [[nodiscard]] QString FormatPlayedText(qint64 played, qint64 duration); [[nodiscard]] QString FormatImageSizeText(const QSize &size); -[[nodiscard]] QString FormatPhone(const QString &phone); +[[nodiscard]] QString FormatPhone(QString phone); [[nodiscard]] QString FormatTTL(float64 ttl); [[nodiscard]] QString FormatTTLAfter(float64 ttl); [[nodiscard]] QString FormatTTLTiny(float64 ttl);