procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use "subscribers" instead of "members" in channels

This commit is contained in:
RadRussianRus 2020-05-01 14:20:57 +03:00 committed by John Preston
parent ae64747489
commit cad4d19272
7 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/Resources/langs/lang.strings
View File

@ -118,6 +118,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_chat_status_online#one" = "{count} online"; "lng_chat_status_online#one" = "{count} online";
"lng_chat_status_online#other" = "{count} online"; "lng_chat_status_online#other" = "{count} online";
"lng_chat_status_members_online" = "{members_count}, {online_count}"; "lng_chat_status_members_online" = "{members_count}, {online_count}";
"lng_chat_status_subscribers#one" = "{count} subscriber";
"lng_chat_status_subscribers#other" = "{count} subscribers";
"lng_channel_status" = "channel"; "lng_channel_status" = "channel";
"lng_group_status" = "group"; "lng_group_status" = "group";
@ -767,6 +769,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_profile_common_groups#one" = "{count} group in common"; "lng_profile_common_groups#one" = "{count} group in common";
"lng_profile_common_groups#other" = "{count} groups in common"; "lng_profile_common_groups#other" = "{count} groups in common";
"lng_profile_participants_section" = "Members"; "lng_profile_participants_section" = "Members";
"lng_profile_subscribers_section" = "Subscribers";
"lng_profile_mobile_number" = "Mobile:"; "lng_profile_mobile_number" = "Mobile:";
"lng_profile_username" = "Username:"; "lng_profile_username" = "Username:";
"lng_profile_link" = "Link:"; "lng_profile_link" = "Link:";
@ -888,6 +891,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_manage_channel_info" = "Channel Info"; "lng_manage_channel_info" = "Channel Info";
"lng_manage_peer_recent_actions" = "Recent Actions"; "lng_manage_peer_recent_actions" = "Recent Actions";
"lng_manage_peer_members" = "Members"; "lng_manage_peer_members" = "Members";
"lng_manage_peer_subscribers" = "Subscribers";
"lng_manage_peer_administrators" = "Administrators"; "lng_manage_peer_administrators" = "Administrators";
"lng_manage_peer_exceptions" = "Exceptions"; "lng_manage_peer_exceptions" = "Exceptions";
"lng_manage_peer_removed_users" = "Removed users"; "lng_manage_peer_removed_users" = "Removed users";

4
Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
View File

@ -1056,7 +1056,9 @@ void ParticipantsBoxController::prepare() {
switch (_role) { switch (_role) {
case Role::Admins: return tr::lng_channel_admins(); case Role::Admins: return tr::lng_channel_admins();
case Role::Profile: case Role::Profile:
case Role::Members: return tr::lng_profile_participants_section(); case Role::Members: return (_peer->isChannel() && !_peer->isMegagroup()
? tr::lng_profile_subscribers_section()
: tr::lng_profile_participants_section());
case Role::Restricted: return tr::lng_exceptions_list_title(); case Role::Restricted: return tr::lng_exceptions_list_title();
case Role::Kicked: return tr::lng_removed_list_title(); case Role::Kicked: return tr::lng_removed_list_title();
} }

2
Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View File

@ -967,7 +967,7 @@ void Controller::fillManageSection() {
if (canViewMembers) { if (canViewMembers) {
AddButtonWithCount( AddButtonWithCount(
_controls.buttonsLayout, _controls.buttonsLayout,
tr::lng_manage_peer_members(), (_isGroup ? tr::lng_manage_peer_members() : tr::lng_manage_peer_subscribers()),
Info::Profile::MigratedOrMeValue( Info::Profile::MigratedOrMeValue(
_peer _peer
) | rpl::map( ) | rpl::map(

4
Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
View File

@ -873,7 +873,9 @@ void TopBarWidget::updateOnlineDisplay() {
text = tr::lng_group_status(tr::now); text = tr::lng_group_status(tr::now);
} }
} else if (channel->membersCount() > 0) { } else if (channel->membersCount() > 0) {
text = tr::lng_chat_status_members(tr::now, lt_count_decimal, channel->membersCount()); text = channel->isMegagroup()
? tr::lng_chat_status_members(tr::now, lt_count_decimal, channel->membersCount())
: tr::lng_chat_status_subscribers(tr::now, lt_count_decimal, channel->membersCount());
} else { } else {
text = channel->isMegagroup() ? tr::lng_group_status(tr::now) : tr::lng_channel_status(tr::now); text = channel->isMegagroup() ? tr::lng_group_status(tr::now) : tr::lng_channel_status(tr::now);

5
Telegram/SourceFiles/info/info_top_bar.cpp
View File

@ -605,6 +605,11 @@ rpl::producer<QString> TitleValue(
return tr::lng_profile_common_groups_section(); return tr::lng_profile_common_groups_section();
case Section::Type::Members: case Section::Type::Members:
if (const auto channel = peer->asChannel()) {
return channel->isMegagroup()
? tr::lng_profile_participants_section()
: tr::lng_profile_subscribers_section();
}
return tr::lng_profile_participants_section(); return tr::lng_profile_participants_section();
//case Section::Type::Channels: // #feed //case Section::Type::Channels: // #feed

2
Telegram/SourceFiles/info/profile/info_profile_actions.cpp
View File

@ -835,7 +835,7 @@ object_ptr<Ui::RpWidget> SetupChannelMembers(
channel, channel,
MTPDchannelFull::Flag::f_can_view_participants), MTPDchannelFull::Flag::f_can_view_participants),
(_1 > 0) && _2); (_1 > 0) && _2);
auto membersText = tr::lng_chat_status_members( auto membersText = tr::lng_chat_status_subscribers(
lt_count_decimal, lt_count_decimal,
MembersCountValue(channel) | tr::to_count()); MembersCountValue(channel) | tr::to_count());
auto membersCallback = [=] { auto membersCallback = [=] {

13
Telegram/SourceFiles/info/profile/info_profile_cover.cpp
View File

@ -146,10 +146,15 @@ auto ChatStatusText(int fullCount, int onlineCount, bool isGroup) {
lt_online_count, lt_online_count,
OnlineStatusText(onlineCount)); OnlineStatusText(onlineCount));
} else if (fullCount > 0) { } else if (fullCount > 0) {
return tr::lng_chat_status_members( return isGroup
tr::now, ? tr::lng_chat_status_members(
lt_count_decimal, tr::now,
fullCount); lt_count_decimal,
fullCount)
: tr::lng_chat_status_subscribers(
tr::now,
lt_count_decimal,
fullCount);
} }
return isGroup return isGroup
? tr::lng_group_status(tr::now) ? tr::lng_group_status(tr::now)