From 116b5d006ab5fb34d21724c7ad406bbd2309437d Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 30 Apr 2019 14:26:00 +0400 Subject: [PATCH] Divide public/private phrases for groups/channels. --- Telegram/Resources/langs/lang.strings | 2 ++ .../SourceFiles/boxes/peers/edit_peer_info_box.cpp | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 66d88967b..1ab504441 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -833,6 +833,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_manage_peer_group_type" = "Group type"; "lng_manage_peer_channel_type" = "Channel type"; +"lng_manage_private_group_title" = "Private"; +"lng_manage_public_group_title" = "Public"; "lng_manage_private_peer_title" = "Private"; "lng_manage_public_peer_title" = "Public"; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 38ed53ffd..32491c39a 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -489,16 +489,21 @@ void Controller::fillPrivacyTypeButton() { ? Privacy::Public : Privacy::Private; + const auto isGroup = (_peer->isChat() || _peer->isMegagroup()); AddButtonWithText( _controls.buttonsLayout, - Lang::Viewer((_peer->isChat() || _peer->isMegagroup()) + Lang::Viewer(isGroup ? lng_manage_peer_group_type : lng_manage_peer_channel_type), _updadePrivacyType.events( - ) | rpl::map([](Privacy flag) { + ) | rpl::map([=](Privacy flag) { return lang(Privacy::Public == flag - ? lng_manage_public_peer_title - : lng_manage_private_peer_title); + ? (isGroup + ? lng_manage_public_group_title + : lng_manage_public_peer_title) + : (isGroup + ? lng_manage_private_group_title + : lng_manage_private_peer_title)); }), [=] { showEditPeerTypeBox(); });