From 71228eae592ef9f5ce47da008a26038e01ffa93c Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 28 Feb 2022 19:45:19 +0300 Subject: [PATCH] Show user name when deleting all messages from user. --- Telegram/Resources/langs/lang.strings | 2 +- Telegram/SourceFiles/boxes/delete_messages_box.cpp | 6 +++++- Telegram/SourceFiles/window/window_peer_menu.cpp | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 3863f3d6f..ff50bae54 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1565,7 +1565,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_in_dlg_poll" = "Poll"; "lng_ban_user" = "Ban User"; -"lng_delete_all_from" = "Delete all from this user"; +"lng_delete_all_from_user" = "Delete all from {user}"; "lng_report_spam" = "Report Spam"; "lng_report_spam_and_leave" = "Report spam and leave"; "lng_report_spam_done" = "Thank you for your report."; diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp index 400664ea9..e6c3b2de2 100644 --- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp +++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp @@ -182,7 +182,11 @@ void DeleteMessagesBox::prepare() { if (_moderateDeleteAll) { _deleteAll.create( this, - tr::lng_delete_all_from(tr::now), + tr::lng_delete_all_from_user( + tr::now, + lt_user, + Ui::Text::Bold(_moderateFrom->name), + Ui::Text::WithEntities), false, st::defaultBoxCheckbox); } diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 104dc7ecc..c774f9b11 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -1013,7 +1013,11 @@ void PeerMenuBlockUserBox( const auto allFromUser = v::is(suggestClear) ? box->addRow(object_ptr( box, - tr::lng_delete_all_from(tr::now), + tr::lng_delete_all_from_user( + tr::now, + lt_user, + Ui::Text::Bold(peer->name), + Ui::Text::WithEntities), true, st::defaultBoxCheckbox)) : nullptr;