From 61b95461d59ba8a5812b1630ca3cd3431b3fa697 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Wed, 19 Apr 2023 18:21:09 +0400 Subject: [PATCH] Update localization --- Telegram/Telegram-iOS/en.lproj/Localizable.strings | 5 ----- submodules/ChatListUI/Sources/Node/ChatListNode.swift | 7 ++----- .../ChatListUI/Sources/Node/ChatListNodeEntries.swift | 1 - .../Sources/Node/ChatListStorageInfoItem.swift | 9 --------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index e4f83b5618..86699d872e 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -9112,11 +9112,6 @@ Sorry for the inconvenience."; "Wallpaper.ApplyForAll" = "Apply For All Chats"; "Wallpaper.ApplyForChat" = "Apply For This Chat"; -"ChatList.ChatFolderUpdateCount_1" = "1 new chat"; -"ChatList.ChatFolderUpdateCount_any" = "%d new chats"; -"ChatList.ChatFolderUpdateHintTitle" = "You can join %@"; -"ChatList.ChatFolderUpdateHintText" = "Tap here to view them"; - "Premium.MaxSharedFolderMembershipText" = "You can only add **%1$@** shareable folders. Upgrade to **Telegram Premium** to increase this limit up to **%2$@**."; "Premium.MaxSharedFolderMembershipNoPremiumText" = "You can only add **%1$@** shareable folders. We are working to let you increase this limit in the future."; "Premium.MaxSharedFolderMembershipFinalText" = "Sorry, you can only add **%1$@** shareable folders."; diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift index fd358cff29..0dd0e80308 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift @@ -1841,19 +1841,16 @@ public final class ChatListNode: ListView { suggestedChatListNotice, savedMessagesPeer, chatListViewUpdate, - self.chatFolderUpdates.get() |> distinctUntilChanged, self.statePromise.get(), contacts ) - |> mapToQueue { (hideArchivedFolderByDefault, displayArchiveIntro, storageInfo, suggestedChatListNotice, savedMessagesPeer, updateAndFilter, chatFolderUpdates, state, contacts) -> Signal in + |> mapToQueue { (hideArchivedFolderByDefault, displayArchiveIntro, storageInfo, suggestedChatListNotice, savedMessagesPeer, updateAndFilter, state, contacts) -> Signal in let (update, filter) = updateAndFilter let previousHideArchivedFolderByDefaultValue = previousHideArchivedFolderByDefault.swap(hideArchivedFolderByDefault) let notice: ChatListNotice? - if let chatFolderUpdates, chatFolderUpdates.availableChatsToJoin != 0 { - notice = .chatFolderUpdates(count: chatFolderUpdates.availableChatsToJoin) - } else if let suggestedChatListNotice { + if let suggestedChatListNotice { notice = suggestedChatListNotice } else if let storageInfo { notice = .clearStorage(sizeFraction: storageInfo) diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift index 43d34c20ad..595552db43 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift @@ -84,7 +84,6 @@ enum ChatListNotice: Equatable { case setupPassword case premiumUpgrade(discount: Int32) case premiumAnnualDiscount(discount: Int32) - case chatFolderUpdates(count: Int) } enum ChatListNodeEntry: Comparable, Identifiable { diff --git a/submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift b/submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift index e33af5cb73..d9a9c13a7a 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift @@ -172,15 +172,6 @@ class ChatListStorageInfoItemNode: ItemListRevealOptionsItemNode { titleString = titleStringValue textString = NSAttributedString(string: item.strings.ChatList_PremiumAnnualDiscountText, font: textFont, textColor: item.theme.rootController.navigationBar.secondaryTextColor) - case let .chatFolderUpdates(count): - let rawTitleString = item.strings.ChatList_ChatFolderUpdateHintTitle(item.strings.ChatList_ChatFolderUpdateCount(Int32(count))) - let titleStringValue = NSMutableAttributedString(attributedString: NSAttributedString(string: rawTitleString.string, font: titleFont, textColor: item.theme.rootController.navigationBar.primaryTextColor)) - if let range = rawTitleString.ranges.first { - titleStringValue.addAttribute(.foregroundColor, value: item.theme.rootController.navigationBar.accentTextColor, range: range.range) - } - titleString = titleStringValue - - textString = NSAttributedString(string: item.strings.ChatList_ChatFolderUpdateHintText, font: textFont, textColor: item.theme.rootController.navigationBar.secondaryTextColor) } let titleLayout = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleString, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - sideInset - rightInset, height: 100.0)))