From 7f74084237be41004273eb81989b125f1a0906fe Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 31 May 2019 19:47:31 +0300 Subject: [PATCH] Update some more phrases. --- Telegram/Resources/langs/lang.strings | 7 ++++--- .../boxes/peers/edit_linked_chat_box.cpp | 16 ++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 3e94463bf..554d9c585 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -855,13 +855,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_manage_discussion_group_unlink" = "Unlink group"; "lng_manage_discussion_group_posted" = "Everything you post in the channel is forwarded to this group."; "lng_manage_discussion_group_sure" = "Do you want to make {group} the discussion board for {channel}?"; -"lng_manage_linked_channel_private" = "Any member in this group will be able to see the messages in the channel."; +"lng_manage_linked_channel_private" = "Any member of this group will be able to see messages in the channel."; +"lng_manage_discussion_group_private" = "Anyone from the channel will be able to see messages in this group."; "lng_manage_discussion_group_link" = "Link group"; -"lng_manage_discussion_group_private" = "private group"; +"lng_manage_discussion_group_private_status" = "private group"; "lng_manage_linked_channel_about" = "{channel} is linking the group as its discussion board."; "lng_manage_linked_channel_unlink" = "Unlink channel"; "lng_manage_linked_channel_posted" = "All new messages posted in this channel are forwarded to the group."; -"lng_manage_discussion_group_warning" = "Warning: If you set this private group as the disccussion group for your channel, all channel subscribers will be able to access the group. \"Chat history for new members\" will be switched to {visible}."; +"lng_manage_discussion_group_warning" = "\"Chat history for new members\" will be switched to {visible}."; "lng_manage_discussion_group_visible" = "Visible"; "lng_manage_history_visibility_title" = "Chat history for new members"; diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp index 7b848fa4d..eec2f1233 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp @@ -88,7 +88,7 @@ void Controller::prepare() { auto row = std::make_unique(chat); const auto username = chat->userName(); row->setCustomStatus(username.isEmpty() - ? lang(lng_manage_discussion_group_private) + ? lang(lng_manage_discussion_group_private_status) : ('@' + username)); delegate()->peerListAppendRow(std::move(row)); }; @@ -134,11 +134,14 @@ void Controller::choose(not_null chat) { text.append( "\n\n" + lang(lng_manage_linked_channel_private)); } - if (chat->hiddenPreHistory()) { - text.append("\n\n"); - text.append(lng_manage_discussion_group_warning__generic( - lt_visible, - BoldText(lang(lng_manage_discussion_group_visible)))); + if (!chat->isPublic()) { + text.append("\n\n" + lang(lng_manage_discussion_group_private)); + if (chat->hiddenPreHistory()) { + text.append("\n\n"); + text.append(lng_manage_discussion_group_warning__generic( + lt_visible, + BoldText(lang(lng_manage_discussion_group_visible)))); + } } const auto box = std::make_shared>(); const auto sure = [=] { @@ -168,6 +171,7 @@ void Controller::choose(not_null chat) { text.append( "\n\n" + lang(lng_manage_linked_channel_private)); } + text.append("\n\n" + lang(lng_manage_discussion_group_private)); text.append("\n\n"); text.append(lng_manage_discussion_group_warning__generic( lt_visible,