From 4c7f8a4bbb49615ac03c859eea3996ab066cf3bb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Mar 2020 17:51:49 +0400
Subject: [PATCH] Improve filters phrases.
---
Telegram/Resources/langs/lang.strings | 2 +-
Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp | 2 +-
Telegram/SourceFiles/window/window.style | 2 +-
Telegram/SourceFiles/window/window_filters_menu.cpp | 2 +-
Telegram/lib_ui | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 40e0ad990..beac5cdd3 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2247,12 +2247,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_filters_edit" = "Edit Folder";
"lng_filters_new_name" = "Folder name";
"lng_filters_add_chats" = "Add chats";
+"lng_filters_remove_chats" = "Remove chats";
"lng_filters_include" = "Included Chats";
"lng_filters_include_about" = "Choose chats and types of chats that will appear in this folder.";
"lng_filters_exclude" = "Excluded Chats";
"lng_filters_exclude_about" = "Choose chats and types of chats that will never appear in this folder.";
"lng_filters_create_button" = "Create";
-"lng_filters_add_title" = "Add Chats";
"lng_filters_include_title" = "Include Chats";
"lng_filters_exclude_title" = "Exclude Chats";
"lng_filters_edit_types" = "Chat types";
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 543fa98d0..13c5a1c31 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -570,7 +570,7 @@ void EditFilterBox(
const auto excludeAdd = AddButton(
content,
- tr::lng_filters_add_chats() | Ui::Text::ToUpper(),
+ tr::lng_filters_remove_chats() | Ui::Text::ToUpper(),
st::settingsUpdate);
AddSkip(content);
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 748a215f2..406bf29d1 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -260,7 +260,7 @@ windowFiltersButton: SideBarButton(defaultSideBarButton) {
badgeSkip: 4px;
badgeHeight: 17px;
badgeStroke: 2px;
- badgePosition: point(5px, 7px);
+ badgePosition: point(3px, 7px);
iconPosition: point(-1px, 6px);
}
windowFiltersMainMenu: SideBarButton(windowFiltersButton) {
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index bfea04711..f6a0fddc6 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -178,7 +178,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
const auto string = !count
? QString()
: (count > 99)
- ? "..."
+ ? "99+"
: QString::number(count);
raw->setBadge(string, count == muted);
}, raw->lifetime());
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f497eac80..7224c6a19 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f497eac804c596005a2ae41d0b28c55453b65db0
+Subproject commit 7224c6a191e3203bcdc9ae92fdade3575cac4137