From e07a7a4b4cd4c324a78a76530fee137b3ba1b16e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 27 Dec 2017 22:44:04 +0300
Subject: [PATCH] Improve phrases. No Restricted Users in channels info.

---
 Telegram/Resources/langs/lang.strings         |  8 +++---
 .../boxes/peers/manage_peer_box.cpp           | 26 ++++++++++---------
 .../profile/profile_channel_controllers.cpp   | 10 +++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e01ef669f..9fa210bf5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -137,8 +137,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 "lng_error_cant_add_admin_unban" = "Sorry, you can't add this user as an admin because they are in the blacklist and you can't unban them.";
 "lng_error_cant_ban_admin" = "Sorry, you can't ban this user because they are an admin in this group and you are not allowed to demote them.";
 "lng_sure_add_admin_invite" = "This user is not a member of this group. Add them to the group and promote them to admin?";
-"lng_sure_add_admin_unban" = "This user is currently restricted or banned in this group. Are you sure you want to unban and promote them?";
-"lng_sure_ban_admin" = "This user is an admin in this group. Are you sure you want to go ahead and restrict them?";
+"lng_sure_add_admin_invite_channel" = "This user is not a subscriber of this channel. Add them to the channel and promote them to admin?";
+"lng_sure_add_admin_unban" = "This user is currently restricted or banned. Are you sure you want to unban and promote them?";
+"lng_sure_ban_admin" = "This user is an admin. Are you sure you want to go ahead and restrict them?";
 "lng_sure_ban_user_group" = "Ban {user} in the group?";
 "lng_sure_enable_socks" = "Are you sure you want to enable this proxy?\n\nServer: {server}\nPort: {port}\n\nYou can change your proxy server later in the Settings (Connection Type).";
 "lng_sure_enable" = "Enable";
@@ -577,8 +578,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 "lng_profile_kick" = "Remove";
 "lng_profile_sure_kick" = "Remove {user} from the group?";
 "lng_profile_sure_kick_channel" = "Remove {user} from the channel?";
-"lng_profile_sure_remove_admin" = "Remove {user} from group admins?";
-"lng_profile_sure_remove_admin_channel" = "Remove {user} from channel admins?";
+"lng_profile_sure_remove_admin" = "Remove {user} from admins?";
 "lng_profile_loading" = "Loading...";
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
diff --git a/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp
index 5d3e6f825..5d2e43d1c 100644
--- a/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp
@@ -168,18 +168,20 @@ void FillManageBox(
 			st::infoIconAdministrators);
 	}
 	if (channel->canViewBanned()) {
-		AddButtonWithCount(
-			content,
-			Lang::Viewer(lng_manage_peer_restricted_users),
-			Info::Profile::RestrictedCountValue(channel)
-				| ToPositiveNumberString(),
-			[=] {
-				ParticipantsBoxController::Start(
-					controller,
-					channel,
-					ParticipantsBoxController::Role::Restricted);
-			},
-			st::infoIconRestrictedUsers);
+		if (channel->isMegagroup()) {
+			AddButtonWithCount(
+				content,
+				Lang::Viewer(lng_manage_peer_restricted_users),
+				Info::Profile::RestrictedCountValue(channel)
+					| ToPositiveNumberString(),
+				[=] {
+					ParticipantsBoxController::Start(
+						controller,
+						channel,
+						ParticipantsBoxController::Role::Restricted);
+				},
+				st::infoIconRestrictedUsers);
+		}
 		AddButtonWithCount(
 			content,
 			Lang::Viewer(lng_manage_peer_banned_users),
diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
index b8511697c..e981be393 100644
--- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
+++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
@@ -872,10 +872,7 @@ void ParticipantsBoxController::kickMemberSure(not_null<UserData*> user) {
 }
 
 void ParticipantsBoxController::removeAdmin(not_null<UserData*> user) {
-	const auto phrase = _channel->isMegagroup()
-		? lng_profile_sure_remove_admin
-		: lng_profile_sure_remove_admin_channel;
-	const auto text = phrase(lt_user, user->firstName);
+	const auto text = lng_profile_sure_remove_admin(lt_user, user->firstName);
 	const auto weak = base::make_weak(this);
 	_editBox = Ui::show(Box<ConfirmBox>(text, lang(lng_box_remove), [=] {
 		if (const auto strong = weak.get()) {
@@ -1379,7 +1376,10 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 		// The user is not in the group yet.
 		if (_channel->canAddMembers()) {
 			if (!sure) {
-				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_invite), [weak, user] {
+				const auto text = lang(_channel->isMegagroup()
+					? lng_sure_add_admin_invite
+					: lng_sure_add_admin_invite_channel);
+				_editBox = Ui::show(Box<ConfirmBox>(text, [weak, user] {
 					if (weak) {
 						weak->showAdmin(user, true);
 					}