From 77b8d56c03b341723ce3ff9140b238ae006af38d Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 15 Jul 2019 10:58:43 +0200 Subject: [PATCH] Show 'None' if no users are blocked. --- Telegram/Resources/langs/lang.strings | 1 + .../SourceFiles/settings/settings_privacy_security.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 62fe5bf50f..c346b4e68d 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -560,6 +560,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_proxy_sponsor_warning" = "This proxy may display a sponsored channel in your chat list. This doesn't reveal any of your Telegram traffic."; "lng_settings_blocked_users" = "Blocked users"; +"lng_settings_no_blocked_users" = "None"; "lng_settings_show_sessions" = "Show all sessions"; "lng_settings_export_data" = "Export Telegram data"; "lng_settings_destroy_if" = "If away for..."; diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp index d9f41c2d91..9382624dbe 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp @@ -105,9 +105,11 @@ void SetupPrivacy(not_null container) { AddSkip(container, st::settingsPrivacySkip); AddSubsectionTitle(container, tr::lng_settings_privacy_title()); - auto count = BlockedUsersCount( - ) | rpl::map([](int count) { - return count ? QString::number(count) : QString(); + auto count = rpl::combine( + BlockedUsersCount(), + tr::lng_settings_no_blocked_users() + ) | rpl::map([](int count, const QString &none) { + return count ? QString::number(count) : none; }); AddButtonWithLabel( container,