From 79091c3dd886142c222297611e6fdeaa770096b0 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 9 Oct 2019 16:47:30 +0400 Subject: [PATCH 01/34] Support building for iOS 13 --- BUCK | 4 ++++ submodules/Display/Display/StatusBarProxyNode.swift | 2 ++ 2 files changed, 6 insertions(+) diff --git a/BUCK b/BUCK index 934c87404c..dcbd57d9f1 100644 --- a/BUCK +++ b/BUCK @@ -435,6 +435,10 @@ apple_binary( compiler_flags = [ "-DTARGET_OS_WATCH=1", ], + linker_flags = [ + "-e", + "_NSExtensionMain", + ], configs = watch_extension_binary_configs(), frameworks = [ "$SDKROOT/System/Library/Frameworks/UserNotifications.framework", diff --git a/submodules/Display/Display/StatusBarProxyNode.swift b/submodules/Display/Display/StatusBarProxyNode.swift index c94991ad74..51e8d97832 100644 --- a/submodules/Display/Display/StatusBarProxyNode.swift +++ b/submodules/Display/Display/StatusBarProxyNode.swift @@ -16,6 +16,8 @@ public enum StatusBarStyle { self = .White case .blackOpaque: self = .Black + default: + self = .Black } } From 44b9d681b5cf0f1ba19bba23b2553f3a6b2ce9a3 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Thu, 10 Oct 2019 00:20:15 +0400 Subject: [PATCH 02/34] Fix input text sizing --- submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm | 2 +- .../AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm index e8e7547d26..277af0f9c8 100644 --- a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm @@ -446,7 +446,7 @@ textSize = [displayedComponents sizeForConstrainedWidth:constrainedSize.width]; } - CGFloat width = std::ceil(textSize.width + _textContainerInset.left + _textContainerInset.right); + CGFloat width = std::ceil(constrainedSize.width); CGFloat height = std::ceil(textSize.height + _textContainerInset.top + _textContainerInset.bottom); return CGSizeMake(std::fmin(width, constrainedSize.width), std::fmin(height, constrainedSize.height)); } diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm index 598c4398ec..eeff17607d 100644 --- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm +++ b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm @@ -129,7 +129,7 @@ // If our text-view's width is already the constrained width, we can use our existing TextKit stack for this sizing calculation. // Otherwise, we create a temporary stack to size for `constrainedWidth`. - /*if (CGRectGetWidth(components.textView.threadSafeBounds) != constrainedWidth)*/ { + if (CGRectGetWidth(components.textView.threadSafeBounds) != constrainedWidth) { components = [ASTextKitComponents componentsWithAttributedSeedString:components.textStorage textContainerSize:CGSizeMake(constrainedWidth, CGFLOAT_MAX)]; } From 120135b8fe09162cd761af6b85b7901a4b70a65d Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 15:53:59 +0400 Subject: [PATCH 03/34] Update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 133afbe21a..621c3cef60 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # Telegram iOS Source Code Compilation Guide 1. Install the brew package manager, if you haven’t already. -2. Install the packages pkg-config, yasm: +2. Install the packages yasm, cmake: ``` -brew install pkg-config yasm +brew install yasm cmake ``` 3. Clone the project from GitHub: ``` -git clone --recursive https://github.com/peter-iakovlev/Telegram-iOS.git +git clone --recursive https://github.com/TelegramMessenger/Telegram-iOS.git ``` 4. Open Telegram-iOS.workspace. 5. Open the Telegram-iOS-Fork scheme. From 284db5aba8d1c14c44e4db9cc1dc6309dd9282cb Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:05:35 +0400 Subject: [PATCH 04/34] Use peer name localization --- SiriIntents/IntentContacts.swift | 2 +- SiriIntents/IntentMessages.swift | 4 +- .../Sources/BotCheckoutControllerNode.swift | 6 +- .../Sources/BotReceiptControllerNode.swift | 2 +- .../Sources/CallListController.swift | 1 + .../ChatListUI/Sources/ChatContextMenus.swift | 2 +- .../Sources/ChatListController.swift | 4 +- .../Sources/Node/ChatListItemStrings.swift | 1 + .../Sources/Node/ChatListTypingNode.swift | 1 + .../Sources/ContactContextMenus.swift | 1 + .../DeleteChatPeerActionSheetItem.swift | 21 +++--- .../ChatItemGalleryFooterContentNode.swift | 8 ++- .../GalleryUI/Sources/GalleryController.swift | 4 +- .../SecretMediaPreviewController.swift | 1 + .../Sources/HashtagSearchControllerNode.swift | 2 +- .../Sources/InstantPageAnchorItem.swift | 3 +- .../Sources/InstantPageArticleItem.swift | 3 +- .../Sources/InstantPageAudioItem.swift | 3 +- .../Sources/InstantPageContentNode.swift | 7 +- .../Sources/InstantPageController.swift | 2 +- .../Sources/InstantPageControllerNode.swift | 6 +- .../Sources/InstantPageDetailsItem.swift | 5 +- .../Sources/InstantPageDetailsNode.swift | 7 +- .../Sources/InstantPageFeedbackItem.swift | 3 +- .../Sources/InstantPageImageItem.swift | 3 +- .../Sources/InstantPageItem.swift | 3 +- .../InstantPagePeerReferenceItem.swift | 5 +- .../InstantPagePeerReferenceNode.swift | 7 +- .../InstantPagePlayableVideoItem.swift | 3 +- .../InstantPageReferenceControllerNode.swift | 2 +- .../Sources/InstantPageShapeItem.swift | 3 +- .../Sources/InstantPageSlideshowItem.swift | 3 +- .../Sources/InstantPageTableItem.swift | 5 +- .../Sources/InstantPageTextItem.swift | 7 +- .../Sources/InstantPageWebEmbedItem.swift | 3 +- .../Sources/ItemListAvatarAndNameItem.swift | 38 +++++++---- .../LocalizedPeerData/Sources/PeerTitle.swift | 65 ++++++++++++------- .../Sources/SecureIdAuthControllerNode.swift | 5 +- .../Sources/SecureIdAuthFormContentNode.swift | 7 +- .../Sources/SecureIdAuthHeaderNode.swift | 7 +- .../Sources/ChannelAdminController.swift | 1 + .../Sources/ChannelAdminsController.swift | 4 +- .../ChannelBannedMemberController.swift | 6 +- .../Sources/ChannelBlacklistController.swift | 6 +- ...hannelDiscussionGroupActionSheetItem.swift | 13 ++-- ...hannelDiscussionGroupSetupController.swift | 9 +-- .../Sources/ChannelInfoController.swift | 6 +- .../ChannelMembersSearchContainerNode.swift | 8 +-- .../ChannelOwnershipTransferController.swift | 4 +- .../Sources/DeviceContactInfoController.swift | 7 +- .../Sources/GroupInfoController.swift | 10 +-- .../Sources/SecretChatKeyControllerNode.swift | 1 + .../Sources/UserInfoController.swift | 7 +- .../Sources/SelectablePeerNode.swift | 3 +- .../Sources/EditSettingsController.swift | 2 +- .../NotificationExceptionControllerNode.swift | 8 +-- .../SettingsUI/Sources/OpenSettings.swift | 2 +- .../SelectivePrivacySettingsController.swift | 12 ++-- .../Sources/ShareController.swift | 9 +-- .../Sources/ShareControllerNode.swift | 2 +- .../Sources/SharePeersContainerNode.swift | 7 +- ...ionBroadcastNavigationAccessoryPanel.swift | 8 ++- .../MediaNavigationAccessoryHeaderNode.swift | 19 +++--- .../Sources/TelegramBaseController.swift | 6 +- .../Sources/CallControllerNode.swift | 2 +- .../Sources/PresentationCall.swift | 2 +- .../Sources/PresentationCallManager.swift | 2 +- .../TelegramCore/AccountStateReset.swift | 6 +- .../TelegramCore/TelegramCore/PeerUtils.swift | 25 +------ .../TelegramCore/TelegramUser.swift | 16 ++++- .../TelegramUI/ChatController.swift | 19 +++--- .../TelegramUI/ChatControllerNode.swift | 4 +- .../TelegramUI/TelegramUI/ChatEmptyNode.swift | 1 + .../ChatMessageActionUrlAuthController.swift | 9 ++- .../ChatMessageAnimatedStickerItemNode.swift | 4 +- .../ChatMessageBubbleItemNode.swift | 2 +- .../ChatMessageInstantVideoItemNode.swift | 4 +- .../TelegramUI/ChatMessageItemView.swift | 6 +- .../ChatMessageStickerItemNode.swift | 2 +- .../TelegramUI/ChatOverlayNavigationBar.swift | 9 ++- .../ChatRecentActionsHistoryTransition.swift | 62 +++++++++--------- .../ChatReportPeerTitlePanelNode.swift | 1 + .../ChatSearchNavigationContentNode.swift | 1 + .../TelegramUI/TelegramUI/ChatTitleView.swift | 1 + .../ContactMultiselectionController.swift | 2 +- .../TelegramUI/CreateChannelController.swift | 4 +- .../ForwardAccessoryPanelNode.swift | 1 + .../TelegramUI/ManageSharedAccountInfo.swift | 2 +- .../TelegramUI/TelegramUI/MediaManager.swift | 4 +- .../MentionChatInputContextPanelNode.swift | 7 +- .../PeerMediaCollectionController.swift | 1 + .../PeerMessagesMediaPlaylist.swift | 2 +- .../TelegramUI/ReplyAccessoryPanelNode.swift | 2 +- ...retChatHandshakeStatusInputPanelNode.swift | 1 + .../SharedNotificationManager.swift | 9 +-- .../ChannelMemberCategoryListContext.swift | 2 +- .../Sources/LegacyWebSearchGallery.swift | 10 +-- .../Sources/WebSearchController.swift | 2 +- .../Sources/WebSearchControllerNode.swift | 12 ++-- .../Sources/WebSearchGalleryController.swift | 2 +- 100 files changed, 391 insertions(+), 275 deletions(-) diff --git a/SiriIntents/IntentContacts.swift b/SiriIntents/IntentContacts.swift index 79aa8d3506..51de670082 100644 --- a/SiriIntents/IntentContacts.swift +++ b/SiriIntents/IntentContacts.swift @@ -130,7 +130,7 @@ func personWithUser(stableId: String, user: TelegramUser) -> INPerson { } else if let username = user.username { personHandle = INPersonHandle(value: "@\(username)", type: .unknown) } else { - personHandle = INPersonHandle(value: user.displayTitle, type: .unknown) + personHandle = INPersonHandle(value: user.nameOrPhone, type: .unknown) } return INPerson(personHandle: personHandle, nameComponents: nameComponents, displayName: user.debugDisplayTitle, image: nil, contactIdentifier: stableId, customIdentifier: "tg\(user.id.toInt64())") diff --git a/SiriIntents/IntentMessages.swift b/SiriIntents/IntentMessages.swift index 8f419a8cc2..2df853fc80 100644 --- a/SiriIntents/IntentMessages.swift +++ b/SiriIntents/IntentMessages.swift @@ -150,7 +150,7 @@ private func callWithTelegramMessage(_ telegramMessage: Message, account: Accoun personHandle = INPersonHandle(value: user.phone ?? "", type: .phoneNumber) } - let caller = INPerson(personHandle: personHandle, nameComponents: nil, displayName: user.displayTitle, image: nil, contactIdentifier: nil, customIdentifier: "tg\(user.id.toInt64())") + let caller = INPerson(personHandle: personHandle, nameComponents: nil, displayName: user.nameOrPhone, image: nil, contactIdentifier: nil, customIdentifier: "tg\(user.id.toInt64())") let date = Date(timeIntervalSince1970: TimeInterval(telegramMessage.timestamp)) var duration: Int32? @@ -190,7 +190,7 @@ private func messageWithTelegramMessage(_ telegramMessage: Message) -> INMessage } let personIdentifier = "tg\(user.id.toInt64())" - let sender = INPerson(personHandle: personHandle, nameComponents: nil, displayName: user.displayTitle, image: nil, contactIdentifier: personIdentifier, customIdentifier: personIdentifier) + let sender = INPerson(personHandle: personHandle, nameComponents: nil, displayName: user.nameOrPhone, image: nil, contactIdentifier: personIdentifier, customIdentifier: personIdentifier) let date = Date(timeIntervalSince1970: TimeInterval(telegramMessage.timestamp)) let message: INMessage diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift index 337d8fb95c..04aade62c7 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift @@ -239,7 +239,7 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st var botName = "" if let botPeer = botPeer { - botName = botPeer.displayTitle + botName = botPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } entries.append(.header(presentationData.theme, invoice, botName)) @@ -852,7 +852,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz } let amount = NSDecimalNumber(value: Double(totalAmount) * 0.01) - items.append(PKPaymentSummaryItem(label: botPeer.displayTitle, amount: amount)) + items.append(PKPaymentSummaryItem(label: botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), amount: amount)) request.paymentSummaryItems = items @@ -885,7 +885,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz if value { strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true) } else { - strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: strongSelf.presentationData.strings.Checkout_LiabilityAlert(botPeer.displayTitle, providerPeer.displayTitle).0, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: { + strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: strongSelf.presentationData.strings.Checkout_LiabilityAlert(botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), providerPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: { if let strongSelf = self { let _ = ApplicationSpecificNotice.setBotPaymentLiability(accountManager: strongSelf.context.sharedContext.accountManager, peerId: strongSelf.messageId.peerId).start() strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true) diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift index 60978a85b2..f9fe4f9dea 100644 --- a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift @@ -176,7 +176,7 @@ private func botReceiptControllerEntries(presentationData: PresentationData, inv var botName = "" if let botPeer = botPeer { - botName = botPeer.displayTitle + botName = botPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } entries.append(.header(presentationData.theme, invoice, botName)) diff --git a/submodules/CallListUI/Sources/CallListController.swift b/submodules/CallListUI/Sources/CallListController.swift index 35f05f730c..93bbf85f66 100644 --- a/submodules/CallListUI/Sources/CallListController.swift +++ b/submodules/CallListUI/Sources/CallListController.swift @@ -12,6 +12,7 @@ import AccountContext import AlertUI import PresentationDataUtils import AppBundle +import LocalizedPeerData public enum CallListControllerMode { case tab diff --git a/submodules/ChatListUI/Sources/ChatContextMenus.swift b/submodules/ChatListUI/Sources/ChatContextMenus.swift index 9456cbff24..b603bf154b 100644 --- a/submodules/ChatListUI/Sources/ChatContextMenus.swift +++ b/submodules/ChatListUI/Sources/ChatContextMenus.swift @@ -83,7 +83,7 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, source: ChatC } } - if !isSavedMessages, let peer = peer as? TelegramUser, !peer.flags.contains(.isSupport) && peer.botInfo == nil { + if !isSavedMessages, let peer = peer as? TelegramUser, !peer.flags.contains(.isSupport) && peer.botInfo == nil && !peer.isDeleted { if !transaction.isPeerContact(peerId: peer.id) { items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_AddToContacts, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor) }, action: { _, f in context.sharedContext.openAddPersonContact(context: context, peerId: peerId, pushController: { controller in diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index d4c8fea48f..2b914fde47 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -1390,7 +1390,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } } - items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: strongSelf.presentationData.strings)) + items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder)) if canClear { items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.DialogList_ClearHistoryConfirmation, color: .accent, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -1444,7 +1444,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) var items: [ActionSheetItem] = [] - items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: strongSelf.presentationData.strings)) + items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder)) items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.compactDisplayTitle).0, color: .destructive, action: { [weak actionSheet] in beginClear(.forEveryone) actionSheet?.dismissAnimated() diff --git a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift index a970acd3c8..3c665c8981 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift @@ -4,6 +4,7 @@ import TelegramCore import TelegramPresentationData import TelegramUIPreferences import TelegramStringFormatting +import LocalizedPeerData public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message?, chatPeer: RenderedPeer, accountPeerId: PeerId, enableMediaEmoji: Bool = true, isPeerGroup: Bool = false) -> (peer: Peer?, hideAuthor: Bool, messageText: String) { let peer: Peer? diff --git a/submodules/ChatListUI/Sources/Node/ChatListTypingNode.swift b/submodules/ChatListUI/Sources/Node/ChatListTypingNode.swift index 5eeed83f05..72f56ed7e0 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListTypingNode.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListTypingNode.swift @@ -7,6 +7,7 @@ import Display import SwiftSignalKit import TelegramPresentationData import ChatTitleActivityNode +import LocalizedPeerData private let textFont = Font.regular(15.0) diff --git a/submodules/ContactListUI/Sources/ContactContextMenus.swift b/submodules/ContactListUI/Sources/ContactContextMenus.swift index 66d4fa6e5e..13c11b6ddb 100644 --- a/submodules/ContactListUI/Sources/ContactContextMenus.swift +++ b/submodules/ContactListUI/Sources/ContactContextMenus.swift @@ -9,6 +9,7 @@ import Display import AlertUI import PresentationDataUtils import OverlayStatusController +import LocalizedPeerData func contactContextMenuItems(context: AccountContext, peerId: PeerId, contactsController: ContactsController?) -> Signal<[ContextMenuItem], NoError> { let strings = context.sharedContext.currentPresentationData.with({ $0 }).strings diff --git a/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift b/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift index 415c3881a5..c9e92e8510 100644 --- a/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift +++ b/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift @@ -4,6 +4,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import AvatarNode import AccountContext @@ -18,17 +19,19 @@ public final class DeleteChatPeerActionSheetItem: ActionSheetItem { let chatPeer: Peer let action: DeleteChatPeerAction let strings: PresentationStrings + let nameDisplayOrder: PresentationPersonNameOrder - public init(context: AccountContext, peer: Peer, chatPeer: Peer, action: DeleteChatPeerAction, strings: PresentationStrings) { + public init(context: AccountContext, peer: Peer, chatPeer: Peer, action: DeleteChatPeerAction, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { self.context = context self.peer = peer self.chatPeer = chatPeer self.action = action self.strings = strings + self.nameDisplayOrder = nameDisplayOrder } public func node(theme: ActionSheetControllerTheme) -> ActionSheetItemNode { - return DeleteChatPeerActionSheetItemNode(theme: theme, strings: self.strings, context: self.context, peer: self.peer, chatPeer: self.chatPeer, action: self.action) + return DeleteChatPeerActionSheetItemNode(theme: theme, strings: self.strings, nameOrder: self.nameDisplayOrder, context: self.context, peer: self.peer, chatPeer: self.chatPeer, action: self.action) } public func updateNode(_ node: ActionSheetItemNode) { @@ -46,7 +49,7 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode { private let accessibilityArea: AccessibilityAreaNode - init(theme: ActionSheetControllerTheme, strings: PresentationStrings, context: AccountContext, peer: Peer, chatPeer: Peer, action: DeleteChatPeerAction) { + init(theme: ActionSheetControllerTheme, strings: PresentationStrings, nameOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, chatPeer: Peer, action: DeleteChatPeerAction) { self.theme = theme self.strings = strings @@ -82,15 +85,17 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode { case .delete: if chatPeer.id == context.account.peerId { text = (strings.ChatList_DeleteSavedMessagesConfirmation, []) - } else if chatPeer is TelegramGroup || chatPeer is TelegramChannel { - text = strings.ChatList_LeaveGroupConfirmation(peer.displayTitle) + } else if let chatPeer = chatPeer as? TelegramGroup { + text = strings.ChatList_LeaveGroupConfirmation(chatPeer.title) + } else if let chatPeer = chatPeer as? TelegramChannel { + text = strings.ChatList_LeaveGroupConfirmation(chatPeer.title) } else if chatPeer is TelegramSecretChat { - text = strings.ChatList_DeleteSecretChatConfirmation(peer.displayTitle) + text = strings.ChatList_DeleteSecretChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder)) } else { - text = strings.ChatList_DeleteChatConfirmation(peer.displayTitle) + text = strings.ChatList_DeleteChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder)) } case .clearHistory: - text = strings.ChatList_ClearChatConfirmation(peer.displayTitle) + text = strings.ChatList_ClearChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder)) } let attributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: Font.regular(14.0), textColor: theme.primaryTextColor)) for (_, range) in text.1 { diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index 1b7de2ec83..5e784e7d54 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SwiftSignalKit import Photos import TelegramPresentationData +import TelegramUIPreferences import TextFormat import TelegramStringFormatting import AccountContext @@ -14,6 +15,7 @@ import RadialStatusNode import ShareController import OpenInExternalAppUI import AppBundle +import LocalizedPeerData private let deleteImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: .white) private let actionImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: .white) @@ -105,6 +107,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll private let context: AccountContext private var theme: PresentationTheme private var strings: PresentationStrings + private var nameOrder: PresentationPersonNameOrder private var dateTimeFormat: PresentationDateTimeFormat private let deleteButton: UIButton @@ -241,6 +244,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll self.context = context self.theme = presentationData.theme self.strings = presentationData.strings + self.nameOrder = presentationData.nameDisplayOrder self.dateTimeFormat = presentationData.dateTimeFormat self.deleteButton = UIButton() @@ -439,9 +443,9 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll var authorNameText: String? if let author = message.effectiveAuthor { - authorNameText = author.displayTitle + authorNameText = author.displayTitle(strings: self.strings, displayOrder: self.nameOrder) } else if let peer = message.peers[message.id.peerId] { - authorNameText = peer.displayTitle + authorNameText = peer.displayTitle(strings: self.strings, displayOrder: self.nameOrder) } let dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: message.timestamp) diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index 15c37b30d0..e5ff548c09 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -172,7 +172,7 @@ public func galleryItemForEntry(context: AccountContext, presentationData: Prese } let caption = galleryCaptionStringWithAppliedEntities(text, entities: entities) - return UniversalVideoGalleryItem(context: context, presentationData: presentationData, content: content, originData: GalleryItemOriginData(title: message.effectiveAuthor?.displayTitle, timestamp: message.timestamp), indexData: location.flatMap { GalleryItemIndexData(position: Int32($0.index), totalCount: Int32($0.count)) }, contentInfo: .message(message), caption: caption, hideControls: hideControls, fromPlayingVideo: fromPlayingVideo, landscape: landscape, timecode: timecode, playbackCompleted: playbackCompleted, performAction: performAction, openActionOptions: openActionOptions) + return UniversalVideoGalleryItem(context: context, presentationData: presentationData, content: content, originData: GalleryItemOriginData(title: message.effectiveAuthor?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), timestamp: message.timestamp), indexData: location.flatMap { GalleryItemIndexData(position: Int32($0.index), totalCount: Int32($0.count)) }, contentInfo: .message(message), caption: caption, hideControls: hideControls, fromPlayingVideo: fromPlayingVideo, landscape: landscape, timecode: timecode, playbackCompleted: playbackCompleted, performAction: performAction, openActionOptions: openActionOptions) } else { if let fileName = file.fileName, (fileName as NSString).pathExtension.lowercased() == "json" { return ChatAnimationGalleryItem(context: context, presentationData: presentationData, message: message, location: location) @@ -211,7 +211,7 @@ public func galleryItemForEntry(context: AccountContext, presentationData: Prese } } if let content = content { - return UniversalVideoGalleryItem(context: context, presentationData: presentationData, content: content, originData: GalleryItemOriginData(title: message.effectiveAuthor?.displayTitle, timestamp: message.timestamp), indexData: location.flatMap { GalleryItemIndexData(position: Int32($0.index), totalCount: Int32($0.count)) }, contentInfo: .message(message), caption: NSAttributedString(string: ""), fromPlayingVideo: fromPlayingVideo, landscape: landscape, timecode: timecode, performAction: performAction, openActionOptions: openActionOptions) + return UniversalVideoGalleryItem(context: context, presentationData: presentationData, content: content, originData: GalleryItemOriginData(title: message.effectiveAuthor?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), timestamp: message.timestamp), indexData: location.flatMap { GalleryItemIndexData(position: Int32($0.index), totalCount: Int32($0.count)) }, contentInfo: .message(message), caption: NSAttributedString(string: ""), fromPlayingVideo: fromPlayingVideo, landscape: landscape, timecode: timecode, performAction: performAction, openActionOptions: openActionOptions) } else { return nil } diff --git a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift index c2b2d7c83d..96b89d881e 100644 --- a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift +++ b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift @@ -10,6 +10,7 @@ import AccountContext import RadialStatusNode import ScreenCaptureDetection import AppBundle +import LocalizedPeerData private func galleryMediaForMedia(media: Media) -> Media? { if let media = media as? TelegramMediaImage { diff --git a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift index e2231e6313..f84d45347c 100644 --- a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift +++ b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift @@ -42,7 +42,7 @@ final class HashtagSearchControllerNode: ASDisplayNode { if peer?.id == context.account.peerId { items.append(presentationData.strings.Conversation_SavedMessages) } else { - items.append(peer?.displayTitle ?? "") + items.append(peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) ?? "") } items.append(strings.HashtagSearch_AllChats) self.segmentedControlNode = SegmentedControlNode(theme: SegmentedControlTheme(theme: theme), items: items.map { SegmentedControlItem(title: $0) }, selectedIndex: 0) diff --git a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift index af563bbdfa..7355720c99 100644 --- a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageAnchorItem: InstantPageItem { @@ -26,7 +27,7 @@ final class InstantPageAnchorItem: InstantPageItem { func drawInTile(context: CGContext) { } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return nil } diff --git a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift index 20d4862668..297ae995cf 100644 --- a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageArticleItem: InstantPageItem { @@ -31,7 +32,7 @@ final class InstantPageArticleItem: InstantPageItem { self.rtl = rtl } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageArticleNode(context: context, item: self, webPage: self.webPage, strings: strings, theme: theme, contentItems: self.contentItems, contentSize: self.contentSize, cover: self.cover, url: self.url, webpageId: self.webpageId, rtl: self.rtl, openUrl: openUrl) } diff --git a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift index 64bcb67aee..81690b977e 100644 --- a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageAudioItem: InstantPageItem { @@ -22,7 +23,7 @@ final class InstantPageAudioItem: InstantPageItem { self.medias = [media] } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageAudioNode(context: context, strings: strings, theme: theme, webPage: self.webpage, media: self.media, openMedia: openMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift index 234d8e714b..4c66008ea6 100644 --- a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift @@ -6,11 +6,13 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageContentNode : ASDisplayNode { private let context: AccountContext private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let theme: InstantPageTheme private let openMedia: (InstantPageMedia) -> Void @@ -37,9 +39,10 @@ final class InstantPageContentNode : ASDisplayNode { private var previousVisibleBounds: CGRect? - init(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, items: [InstantPageItem], contentSize: CGSize, inOverlayPanel: Bool = false, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void) { + init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, items: [InstantPageItem], contentSize: CGSize, inOverlayPanel: Bool = false, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void) { self.context = context self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.theme = theme self.openMedia = openMedia @@ -183,7 +186,7 @@ final class InstantPageContentNode : ASDisplayNode { if itemNode == nil { let itemIndex = itemIndex let detailsIndex = detailsIndex - if let newNode = item.node(context: self.context, strings: self.strings, theme: theme, openMedia: { [weak self] media in + if let newNode = item.node(context: self.context, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, theme: theme, openMedia: { [weak self] media in self?.openMedia(media) }, longPressMedia: { [weak self] media in self?.longPressMedia(media) diff --git a/submodules/InstantPageUI/Sources/InstantPageController.swift b/submodules/InstantPageUI/Sources/InstantPageController.swift index f3913033b7..e943641e73 100644 --- a/submodules/InstantPageUI/Sources/InstantPageController.swift +++ b/submodules/InstantPageUI/Sources/InstantPageController.swift @@ -95,7 +95,7 @@ public final class InstantPageController: ViewController { } override public func loadDisplayNode() { - self.displayNode = InstantPageControllerNode(context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in + self.displayNode = InstantPageControllerNode(context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in return self?.navigationController as? NavigationController }, present: { [weak self] c, a in self?.present(c, in: .window(.root), with: a, blockInteraction: true) diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift index e11318bf76..d708693082 100644 --- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift @@ -21,6 +21,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { private var themeSettings: PresentationThemeSettings? private var presentationTheme: PresentationTheme private var strings: PresentationStrings + private var nameDisplayOrder: PresentationPersonNameOrder private var dateTimeFormat: PresentationDateTimeFormat private var theme: InstantPageTheme? private let sourcePeerType: MediaAutoDownloadPeerType @@ -85,10 +86,11 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { return InstantPageStoredState(contentOffset: Double(self.scrollNode.view.contentOffset.y), details: details) } - init(context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) { + init(context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) { self.context = context self.presentationTheme = presentationTheme self.dateTimeFormat = dateTimeFormat + self.nameDisplayOrder = nameDisplayOrder self.strings = strings self.settings = settings let themeReferenceDate = Date() @@ -532,7 +534,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate { let itemIndex = itemIndex let embedIndex = embedIndex let detailsIndex = detailsIndex - if let newNode = item.node(context: self.context, strings: self.strings, theme: theme, openMedia: { [weak self] media in + if let newNode = item.node(context: self.context, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, theme: theme, openMedia: { [weak self] media in self?.openMedia(media) }, longPressMedia: { [weak self] media in self?.longPressMedia(media) diff --git a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift index e35851ee9b..ba8e7508eb 100644 --- a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift @@ -5,6 +5,7 @@ import TelegramCore import AsyncDisplayKit import Display import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageDetailsItem: InstantPageItem { @@ -32,12 +33,12 @@ final class InstantPageDetailsItem: InstantPageItem { self.index = index } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { var expanded: Bool? if let expandedDetails = currentExpandedDetails, let currentlyExpanded = expandedDetails[self.index] { expanded = currentlyExpanded } - return InstantPageDetailsNode(context: context, strings: strings, theme: theme, item: self, openMedia: openMedia, longPressMedia: longPressMedia, openPeer: openPeer, openUrl: openUrl, currentlyExpanded: expanded, updateDetailsExpanded: updateDetailsExpanded) + return InstantPageDetailsNode(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, item: self, openMedia: openMedia, longPressMedia: longPressMedia, openPeer: openPeer, openUrl: openUrl, currentlyExpanded: expanded, updateDetailsExpanded: updateDetailsExpanded) } func matchesAnchor(_ anchor: String) -> Bool { diff --git a/submodules/InstantPageUI/Sources/InstantPageDetailsNode.swift b/submodules/InstantPageUI/Sources/InstantPageDetailsNode.swift index 41703f4ae7..74d94e6a48 100644 --- a/submodules/InstantPageUI/Sources/InstantPageDetailsNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageDetailsNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext private let detailsInset: CGFloat = 17.0 @@ -14,6 +15,7 @@ private let titleInset: CGFloat = 22.0 final class InstantPageDetailsNode: ASDisplayNode, InstantPageNode { private let context: AccountContext private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let theme: InstantPageTheme let item: InstantPageDetailsItem @@ -33,9 +35,10 @@ final class InstantPageDetailsNode: ASDisplayNode, InstantPageNode { var requestLayoutUpdate: ((Bool) -> Void)? - init(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, item: InstantPageDetailsItem, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, currentlyExpanded: Bool?, updateDetailsExpanded: @escaping (Bool) -> Void) { + init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, item: InstantPageDetailsItem, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, currentlyExpanded: Bool?, updateDetailsExpanded: @escaping (Bool) -> Void) { self.context = context self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.theme = theme self.item = item @@ -62,7 +65,7 @@ final class InstantPageDetailsNode: ASDisplayNode, InstantPageNode { self.arrowNode = InstantPageDetailsArrowNode(color: theme.controlColor, open: self.expanded) self.separatorNode = ASDisplayNode() - self.contentNode = InstantPageContentNode(context: context, strings: strings, theme: theme, items: item.items, contentSize: CGSize(width: item.frame.width, height: item.frame.height - item.titleHeight), openMedia: openMedia, longPressMedia: longPressMedia, openPeer: openPeer, openUrl: openUrl) + self.contentNode = InstantPageContentNode(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, items: item.items, contentSize: CGSize(width: item.frame.width, height: item.frame.height - item.titleHeight), openMedia: openMedia, longPressMedia: longPressMedia, openPeer: openPeer, openUrl: openUrl) super.init() diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift index d87a30f89e..fed9f7ff03 100644 --- a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageFeedbackItem: InstantPageItem { @@ -19,7 +20,7 @@ final class InstantPageFeedbackItem: InstantPageItem { self.webPage = webPage } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageFeedbackNode(context: context, strings: strings, theme: theme, webPage: self.webPage, openUrl: openUrl) } diff --git a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift index 5d4f37303e..fd41ed57f6 100644 --- a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext protocol InstantPageImageAttribute { @@ -43,7 +44,7 @@ final class InstantPageImageItem: InstantPageItem { self.fit = fit } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageImageNode(context: context, theme: theme, webPage: self.webPage, media: self.media, attributes: self.attributes, interactive: self.interactive, roundCorners: self.roundCorners, fit: self.fit, openMedia: openMedia, longPressMedia: longPressMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageItem.swift b/submodules/InstantPageUI/Sources/InstantPageItem.swift index c60a5e39c5..c9608e06e8 100644 --- a/submodules/InstantPageUI/Sources/InstantPageItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext protocol InstantPageItem { @@ -14,7 +15,7 @@ protocol InstantPageItem { func matchesAnchor(_ anchor: String) -> Bool func drawInTile(context: CGContext) - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? func matchesNode(_ node: InstantPageNode) -> Bool func linkSelectionRects(at point: CGPoint) -> [CGRect] diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift index 06b321ded9..cde027b319 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPagePeerReferenceItem: InstantPageItem { @@ -25,8 +26,8 @@ final class InstantPagePeerReferenceItem: InstantPageItem { self.rtl = rtl } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { - return InstantPagePeerReferenceNode(context: context, strings: strings, theme: theme, initialPeer: self.initialPeer, safeInset: self.safeInset, transparent: self.transparent, rtl: self.rtl, openPeer: openPeer) + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + return InstantPagePeerReferenceNode(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, initialPeer: self.initialPeer, safeInset: self.safeInset, transparent: self.transparent, rtl: self.rtl, openPeer: openPeer) } func matchesAnchor(_ anchor: String) -> Bool { diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift index f95e305c22..864a488a28 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift @@ -6,6 +6,7 @@ import SwiftSignalKit import AsyncDisplayKit import Display import TelegramPresentationData +import TelegramUIPreferences import ActivityIndicator import AccountContext import AppBundle @@ -52,6 +53,7 @@ final class InstantPagePeerReferenceNode: ASDisplayNode, InstantPageNode { private let transparent: Bool private let rtl: Bool private var strings: PresentationStrings + private var nameDisplayOrder: PresentationPersonNameOrder private var theme: InstantPageTheme private let openPeer: (PeerId) -> Void @@ -68,9 +70,10 @@ final class InstantPagePeerReferenceNode: ASDisplayNode, InstantPageNode { private let joinDisposable = MetaDisposable() private var joinState: JoinState = .none - init(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, initialPeer: Peer, safeInset: CGFloat, transparent: Bool, rtl: Bool, openPeer: @escaping (PeerId) -> Void) { + init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, initialPeer: Peer, safeInset: CGFloat, transparent: Bool, rtl: Bool, openPeer: @escaping (PeerId) -> Void) { self.context = context self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.theme = theme self.peer = initialPeer self.safeInset = safeInset @@ -208,7 +211,7 @@ final class InstantPagePeerReferenceNode: ASDisplayNode, InstantPageNode { private func applyThemeAndStrings(themeUpdated: Bool) { if let peer = self.peer { let textColor = self.transparent ? UIColor.white : self.theme.panelPrimaryColor - self.nameNode.attributedText = NSAttributedString(string: peer.displayTitle, font: Font.medium(17.0), textColor: textColor) + self.nameNode.attributedText = NSAttributedString(string: peer.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder), font: Font.medium(17.0), textColor: textColor) } let accentColor = self.transparent ? UIColor.white : self.theme.panelAccentColor self.joinNode.setAttributedTitle(NSAttributedString(string: self.strings.Channel_JoinChannel, font: Font.medium(17.0), textColor: accentColor), for: []) diff --git a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift index 1f161067e3..432e2db8bc 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPagePlayableVideoItem: InstantPageItem { @@ -27,7 +28,7 @@ final class InstantPagePlayableVideoItem: InstantPageItem { self.interactive = interactive } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPagePlayableVideoNode(context: context, webPage: self.webPage, theme: theme, media: self.media, interactive: self.interactive, openMedia: openMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift index 4443054da7..648ac97cdc 100644 --- a/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageReferenceControllerNode.swift @@ -201,7 +201,7 @@ class InstantPageReferenceControllerNode: ViewControllerTracingNode, UIScrollVie let sideInset: CGFloat = 16.0 let (_, items, contentSize) = layoutTextItemWithString(self.anchorText, boundingWidth: width - sideInset * 2.0, offset: CGPoint(x: sideInset, y: sideInset), media: media, webpage: self.webPage) - let contentNode = InstantPageContentNode(context: self.context, strings: self.presentationData.strings, theme: self.theme, items: items, contentSize: CGSize(width: width, height: contentSize.height), inOverlayPanel: true, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in }) + let contentNode = InstantPageContentNode(context: self.context, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder, theme: self.theme, items: items, contentSize: CGSize(width: width, height: contentSize.height), inOverlayPanel: true, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in }) transition.updateFrame(node: contentNode, frame: CGRect(origin: CGPoint(x: 0.0, y: titleAreaHeight), size: CGSize(width: width, height: contentSize.height))) self.contentContainerNode.insertSubnode(contentNode, at: 0) self.contentNode = contentNode diff --git a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift index ce1103843d..b21f3654cd 100644 --- a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext enum InstantPageShape { @@ -60,7 +61,7 @@ final class InstantPageShapeItem: InstantPageItem { return false } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return nil } diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift index 0f213e172f..10ed04f803 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageSlideshowItem: InstantPageItem { @@ -19,7 +20,7 @@ final class InstantPageSlideshowItem: InstantPageItem { self.medias = medias } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageSlideshowNode(context: context, theme: theme, webPage: webPage, medias: self.medias, openMedia: openMedia, longPressMedia: longPressMedia) } diff --git a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift index 91f0642e52..84e5896333 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift @@ -5,6 +5,7 @@ import TelegramCore import Postbox import Display import TelegramPresentationData +import TelegramUIPreferences import AccountContext private struct TableSide: OptionSet { @@ -198,12 +199,12 @@ final class InstantPageTableItem: InstantPageScrollableItem { return false } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { var additionalNodes: [InstantPageNode] = [] for cell in self.cells { for item in cell.additionalItems { if item.wantsNode { - if let node = item.node(context: context, strings: strings, theme: theme, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { + if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { node.frame = item.frame.offsetBy(dx: cell.frame.minX, dy: cell.frame.minY) additionalNodes.append(node) } diff --git a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift index 5c674293f2..34da7e4d8e 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift @@ -5,6 +5,7 @@ import Display import Postbox import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import TextFormat import AccountContext @@ -340,7 +341,7 @@ final class InstantPageTextItem: InstantPageItem { return false } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return nil } @@ -389,11 +390,11 @@ final class InstantPageScrollableTextItem: InstantPageScrollableItem { context.restoreGState() } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (ASDisplayNode & InstantPageNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { var additionalNodes: [InstantPageNode] = [] for item in additionalItems { if item.wantsNode { - if let node = item.node(context: context, strings: strings, theme: theme, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { + if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) { node.frame = item.frame additionalNodes.append(node) } diff --git a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift index d4eb63c8a2..13ee291a9c 100644 --- a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift @@ -4,6 +4,7 @@ import Postbox import TelegramCore import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import AccountContext final class InstantPageWebEmbedItem: InstantPageItem { @@ -23,7 +24,7 @@ final class InstantPageWebEmbedItem: InstantPageItem { self.enableScrolling = enableScrolling } - func node(context: AccountContext, strings: PresentationStrings, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { + func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? { return InstantPageWebEmbedNode(frame: self.frame, url: self.url, html: self.html, enableScrolling: self.enableScrolling, updateWebEmbedHeight: updateWebEmbedHeight) } diff --git a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift index 3e72510504..594d9c3908 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift +++ b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift @@ -26,13 +26,13 @@ public enum ItemListAvatarAndNameInfoItemTitleType { } public enum ItemListAvatarAndNameInfoItemName: Equatable { - case personName(firstName: String, lastName: String) + case personName(firstName: String, lastName: String, phone: String) case title(title: String, type: ItemListAvatarAndNameInfoItemTitleType) public init(_ peer: Peer) { switch peer.indexName { - case let .personName(first, last, _, _): - self = .personName(firstName: first, lastName: last) + case let .personName(first, last, _, phone): + self = .personName(firstName: first, lastName: last, phone: phone ?? "") case let .title(title, _): let type: ItemListAvatarAndNameInfoItemTitleType if let peer = peer as? TelegramChannel, case .broadcast = peer.info { @@ -46,7 +46,7 @@ public enum ItemListAvatarAndNameInfoItemName: Equatable { public var composedTitle: String { switch self { - case let .personName(firstName, lastName): + case let .personName(firstName, lastName, phone): if !firstName.isEmpty && !lastName.isEmpty { return firstName + " " + lastName } else if !firstName.isEmpty { @@ -61,7 +61,21 @@ public enum ItemListAvatarAndNameInfoItemName: Equatable { public func composedDisplayTitle(strings: PresentationStrings) -> String { switch self { - case let .personName(firstName, lastName): + case let .personName(firstName, lastName, phone): + if !firstName.isEmpty { + if !lastName.isEmpty { + return "\(firstName) \(lastName)" + } else { + return firstName + } + } else if !lastName.isEmpty { + return lastName + } else if !phone.isEmpty { + return formatPhoneNumber("+\(phone)") + } else { + return strings.User_DeletedAccount + } + if !firstName.isEmpty && !lastName.isEmpty { return firstName + " " + lastName } else if !firstName.isEmpty { @@ -76,10 +90,10 @@ public enum ItemListAvatarAndNameInfoItemName: Equatable { } } - public var isEmpty: Bool { + public var isEmpty: Bool { switch self { - case let .personName(firstName, _): - return firstName.isEmpty + case let .personName(firstName, lastName, phone): + return firstName.isEmpty && lastName.isEmpty && phone.isEmpty case let .title(title, _): return title.isEmpty } @@ -559,7 +573,9 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo } if item.call != nil { - strongSelf.addSubnode(strongSelf.callButton) + if strongSelf.callButton.supernode == nil { + strongSelf.addSubnode(strongSelf.callButton) + } strongSelf.callButton.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 44.0 - 10.0, y: floor((contentSize.height - 44.0) / 2.0) - 2.0), size: CGSize(width: 44.0, height: 44.0)) } else if strongSelf.callButton.supernode != nil { @@ -695,7 +711,7 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo } let keyboardAppearance = item.theme.rootController.keyboardColor.keyboardAppearance switch editingName { - case let .personName(firstName, lastName): + case let .personName(firstName, lastName, _): if strongSelf.inputSeparator == nil { let inputSeparator = ASDisplayNode() inputSeparator.isLayerBacked = true @@ -1006,7 +1022,7 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo if let item = self.item, let currentEditingName = item.state.editingName { var editingName: ItemListAvatarAndNameInfoItemName? if let inputFirstField = self.inputFirstField, let inputSecondField = self.inputSecondField { - editingName = .personName(firstName: inputFirstField.text ?? "", lastName: inputSecondField.text ?? "") + editingName = .personName(firstName: inputFirstField.text ?? "", lastName: inputSecondField.text ?? "", phone: "") } else if let inputFirstField = self.inputFirstField { if case let .title(_, type) = currentEditingName { editingName = .title(title: inputFirstField.text ?? "", type: type) diff --git a/submodules/LocalizedPeerData/Sources/PeerTitle.swift b/submodules/LocalizedPeerData/Sources/PeerTitle.swift index 6230f7a2c5..6ffde8fc79 100644 --- a/submodules/LocalizedPeerData/Sources/PeerTitle.swift +++ b/submodules/LocalizedPeerData/Sources/PeerTitle.swift @@ -5,33 +5,54 @@ import TelegramPresentationData import TelegramUIPreferences public extension Peer { + var compactDisplayTitle: String { + switch self { + case let user as TelegramUser: + if let firstName = user.firstName, !firstName.isEmpty { + return firstName + } else if let lastName = user.lastName, !lastName.isEmpty { + return lastName + } else if let phone = user.phone { + return formatPhoneNumber("+\(phone)") + } else { + return "" + } + case let group as TelegramGroup: + return group.title + case let channel as TelegramChannel: + return channel.title + default: + return "" + } + } + func displayTitle(strings: PresentationStrings, displayOrder: PresentationPersonNameOrder) -> String { switch self { - case let user as TelegramUser: - if let firstName = user.firstName { - if let lastName = user.lastName { - switch displayOrder { - case .firstLast: - return "\(firstName) \(lastName)" - case .lastFirst: - return "\(lastName) \(firstName)" - } - } else { - return firstName + case let user as TelegramUser: + if let firstName = user.firstName, !firstName.isEmpty { + if let lastName = user.lastName, !lastName.isEmpty { + switch displayOrder { + case .firstLast: + return "\(firstName) \(lastName)" + case .lastFirst: + return "\(lastName) \(firstName)" } - } else if let lastName = user.lastName { - return lastName - } else if let phone = user.phone { - return "+\(phone)" } else { - return strings.User_DeletedAccount + return firstName } - case let group as TelegramGroup: - return group.title - case let channel as TelegramChannel: - return channel.title - default: - return "" + } else if let lastName = user.lastName, !lastName.isEmpty { + return lastName + } else if let phone = user.phone { + return formatPhoneNumber("+\(phone)") + } else { + return strings.User_DeletedAccount + } + case let group as TelegramGroup: + return group.title + case let channel as TelegramChannel: + return channel.title + default: + return "" } } } diff --git a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift index a618720e0c..e376edf4fd 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift @@ -6,6 +6,7 @@ import AsyncDisplayKit import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import ActivityIndicator import AccountContext @@ -43,7 +44,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { self.activityIndicator.isHidden = true self.scrollNode = ASScrollNode() - self.headerNode = SecureIdAuthHeaderNode(account: context.account, theme: presentationData.theme, strings: presentationData.strings) + self.headerNode = SecureIdAuthHeaderNode(account: context.account, theme: presentationData.theme, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder) self.acceptNode = SecureIdAuthAcceptNode(title: presentationData.strings.Passport_Authorize, theme: presentationData.theme) super.init() @@ -303,7 +304,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { current.updateValues(formData.values) contentNode = current } else { - let current = SecureIdAuthFormContentNode(theme: self.presentationData.theme, strings: self.presentationData.strings, peer: encryptedFormData.servicePeer, privacyPolicyUrl: encryptedFormData.form.termsUrl, form: formData, primaryLanguageByCountry: encryptedFormData.primaryLanguageByCountry, openField: { [weak self] field in + let current = SecureIdAuthFormContentNode(theme: self.presentationData.theme, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder, peer: encryptedFormData.servicePeer, privacyPolicyUrl: encryptedFormData.form.termsUrl, form: formData, primaryLanguageByCountry: encryptedFormData.primaryLanguageByCountry, openField: { [weak self] field in if let strongSelf = self { switch field { case .identity, .address: diff --git a/submodules/PassportUI/Sources/SecureIdAuthFormContentNode.swift b/submodules/PassportUI/Sources/SecureIdAuthFormContentNode.swift index 2fcb17ecae..5967f0cd7d 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthFormContentNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthFormContentNode.swift @@ -5,6 +5,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import TextFormat import Markdown @@ -23,7 +24,7 @@ final class SecureIdAuthFormContentNode: ASDisplayNode, SecureIdAuthContentNode, private let requestLayout: () -> Void private var validLayout: CGFloat? - init(theme: PresentationTheme, strings: PresentationStrings, peer: Peer, privacyPolicyUrl: String?, form: SecureIdForm, primaryLanguageByCountry: [String: String], openField: @escaping (SecureIdParsedRequestedFormField) -> Void, openURL: @escaping (String) -> Void, openMention: @escaping (TelegramPeerMention) -> Void, requestLayout: @escaping () -> Void) { + init(theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peer: Peer, privacyPolicyUrl: String?, form: SecureIdForm, primaryLanguageByCountry: [String: String], openField: @escaping (SecureIdParsedRequestedFormField) -> Void, openURL: @escaping (String) -> Void, openMention: @escaping (TelegramPeerMention) -> Void, requestLayout: @escaping () -> Void) { self.requestLayout = requestLayout self.primaryLanguageByCountry = primaryLanguageByCountry @@ -56,13 +57,13 @@ final class SecureIdAuthFormContentNode: ASDisplayNode, SecureIdAuthContentNode, let privacyPolicyAttributes = MarkdownAttributeSet(font: infoFont, textColor: theme.list.freeTextColor) let privacyPolicyLinkAttributes = MarkdownAttributeSet(font: infoFont, textColor: theme.list.itemAccentColor, additionalAttributes: [NSAttributedString.Key.underlineStyle.rawValue: NSUnderlineStyle.single.rawValue as NSNumber, TelegramTextAttributes.URL: privacyPolicyUrl]) - text = parseMarkdownIntoAttributedString(strings.Passport_PrivacyPolicy(peer.displayTitle, (peer.addressName ?? "")).0.replacingOccurrences(of: "]", with: "]()"), attributes: MarkdownAttributes(body: privacyPolicyAttributes, bold: privacyPolicyAttributes, link: privacyPolicyLinkAttributes, linkAttribute: { _ in + text = parseMarkdownIntoAttributedString(strings.Passport_PrivacyPolicy(peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder), (peer.addressName ?? "")).0.replacingOccurrences(of: "]", with: "]()"), attributes: MarkdownAttributes(body: privacyPolicyAttributes, bold: privacyPolicyAttributes, link: privacyPolicyLinkAttributes, linkAttribute: { _ in return nil }), textAlignment: .center) } else { - text = NSAttributedString(string: strings.Passport_AcceptHelp(peer.displayTitle, (peer.addressName ?? "")).0, font: infoFont, textColor: theme.list.freeTextColor, paragraphAlignment: .left) + text = NSAttributedString(string: strings.Passport_AcceptHelp(peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder), (peer.addressName ?? "")).0, font: infoFont, textColor: theme.list.freeTextColor, paragraphAlignment: .left) } self.textNode.attributedText = text diff --git a/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift b/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift index d183e98595..571720da8a 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import AvatarNode import AppBundle @@ -17,6 +18,7 @@ final class SecureIdAuthHeaderNode: ASDisplayNode { private let account: Account private let theme: PresentationTheme private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let serviceAvatarNode: AvatarNode private let titleNode: ImmediateTextNode @@ -24,10 +26,11 @@ final class SecureIdAuthHeaderNode: ASDisplayNode { private var verificationState: SecureIdAuthControllerVerificationState? - init(account: Account, theme: PresentationTheme, strings: PresentationStrings) { + init(account: Account, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { self.account = account self.theme = theme self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.serviceAvatarNode = AvatarNode(font: avatarFont) self.titleNode = ImmediateTextNode() @@ -50,7 +53,7 @@ final class SecureIdAuthHeaderNode: ASDisplayNode { func updateState(formData: SecureIdEncryptedFormData?, verificationState: SecureIdAuthControllerVerificationState) { if let formData = formData { self.serviceAvatarNode.setPeer(account: self.account, theme: self.theme, peer: formData.servicePeer) - let titleData = self.strings.Passport_RequestHeader(formData.servicePeer.displayTitle) + let titleData = self.strings.Passport_RequestHeader(formData.servicePeer.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder)) let titleString = NSMutableAttributedString() titleString.append(NSAttributedString(string: titleData.0, font: textFont, textColor: self.theme.list.freeTextColor)) diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift index cc9895a318..a3deb8e1ef 100644 --- a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift @@ -12,6 +12,7 @@ import AlertUI import PresentationDataUtils import ItemListAvatarAndNameInfoItem import Emoji +import LocalizedPeerData private let rankMaxLength: Int32 = 16 diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift index 7a2004be49..97b01fd797 100644 --- a/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift @@ -221,7 +221,7 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { if peer.id == participant.peer.id { peerText = strings.Channel_Management_LabelAdministrator } else { - peerText = strings.Channel_Management_PromotedBy(peer.displayTitle).0 + peerText = strings.Channel_Management_PromotedBy(peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)).0 } } else { peerText = "" @@ -527,7 +527,7 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa guard let peer = peer, let user = user else { return } - presentControllerImpl?(UndoOverlayController(presentationData: context.sharedContext.currentPresentationData.with { $0 }, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(user.displayTitle, peer.displayTitle).0), elevatedLayout: false, action: { _ in }), nil) + presentControllerImpl?(UndoOverlayController(presentationData: context.sharedContext.currentPresentationData.with { $0 }, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(user.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0), elevatedLayout: false, action: { _ in }), nil) }) } diff --git a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift index 1774bb7f83..bc9de402e1 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift @@ -322,7 +322,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation entries.append(.timeout(presentationData.theme, presentationData.strings.GroupPermission_Duration, currentTimeoutString)) if let initialParticipant = initialParticipant, case let .member(member) = initialParticipant, let banInfo = member.banInfo, let initialBannedBy = initialBannedBy { - entries.append(.exceptionInfo(presentationData.theme, presentationData.strings.GroupPermission_AddedInfo(initialBannedBy.displayTitle, stringForRelativeSymbolicTimestamp(strings: presentationData.strings, relativeTimestamp: banInfo.timestamp, relativeTo: state.referenceTimestamp, dateTimeFormat: presentationData.dateTimeFormat)).0)) + entries.append(.exceptionInfo(presentationData.theme, presentationData.strings.GroupPermission_AddedInfo(initialBannedBy.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), stringForRelativeSymbolicTimestamp(strings: presentationData.strings, relativeTimestamp: banInfo.timestamp, relativeTo: state.referenceTimestamp, dateTimeFormat: presentationData.dateTimeFormat)).0)) entries.append(.delete(presentationData.theme, presentationData.strings.GroupPermission_Delete)) } } else if let group = channelView.peers[channelView.peerId] as? TelegramGroup, let member = memberView.peers[memberView.peerId] { @@ -368,7 +368,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation entries.append(.timeout(presentationData.theme, presentationData.strings.GroupPermission_Duration, currentTimeoutString)) if let initialParticipant = initialParticipant, case let .member(member) = initialParticipant, let banInfo = member.banInfo, let initialBannedBy = initialBannedBy { - entries.append(.exceptionInfo(presentationData.theme, presentationData.strings.GroupPermission_AddedInfo(initialBannedBy.displayTitle, stringForRelativeSymbolicTimestamp(strings: presentationData.strings, relativeTimestamp: banInfo.timestamp, relativeTo: state.referenceTimestamp, dateTimeFormat: presentationData.dateTimeFormat)).0)) + entries.append(.exceptionInfo(presentationData.theme, presentationData.strings.GroupPermission_AddedInfo(initialBannedBy.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), stringForRelativeSymbolicTimestamp(strings: presentationData.strings, relativeTimestamp: banInfo.timestamp, relativeTo: state.referenceTimestamp, dateTimeFormat: presentationData.dateTimeFormat)).0)) entries.append(.delete(presentationData.theme, presentationData.strings.GroupPermission_Delete)) } } @@ -686,7 +686,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI let presentationData = context.sharedContext.currentPresentationData.with { $0 } let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) var items: [ActionSheetItem] = [] - items.append(ActionSheetTextItem(title: presentationData.strings.GroupPermission_ApplyAlertText(peer.displayTitle).0)) + items.append(ActionSheetTextItem(title: presentationData.strings.GroupPermission_ApplyAlertText(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0)) items.append(ActionSheetButtonItem(title: presentationData.strings.GroupPermission_ApplyAlertAction, color: .accent, font: .default, enabled: true, action: { [weak actionSheet] in actionSheet?.dismissAnimated() applyRights() diff --git a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift index 490723ef51..5556660874 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift @@ -163,7 +163,7 @@ private enum ChannelBlacklistEntry: ItemListNodeEntry { switch participant.participant { case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { - text = .text(strings.Channel_Management_RemovedBy(peer.displayTitle).0) + text = .text(strings.Channel_Management_RemovedBy(peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)).0) } default: break @@ -359,8 +359,8 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId) let presentationData = context.sharedContext.currentPresentationData.with { $0 } let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) var items: [ActionSheetItem] = [] - if !participant.peer.displayTitle.isEmpty { - items.append(ActionSheetTextItem(title: participant.peer.displayTitle)) + if !participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder).isEmpty { + items.append(ActionSheetTextItem(title: participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder))) } items.append(ActionSheetButtonItem(title: presentationData.strings.GroupRemoved_ViewUserInfo, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift index c4089b0c03..647a42b430 100644 --- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift +++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift @@ -6,6 +6,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import AvatarNode import AccountContext @@ -14,16 +15,18 @@ final class ChannelDiscussionGroupActionSheetItem: ActionSheetItem { let channelPeer: Peer let groupPeer: Peer let strings: PresentationStrings + let nameDisplayOrder: PresentationPersonNameOrder - init(context: AccountContext, channelPeer: Peer, groupPeer: Peer, strings: PresentationStrings) { + init(context: AccountContext, channelPeer: Peer, groupPeer: Peer, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { self.context = context self.channelPeer = channelPeer self.groupPeer = groupPeer self.strings = strings + self.nameDisplayOrder = nameDisplayOrder } func node(theme: ActionSheetControllerTheme) -> ActionSheetItemNode { - return ChannelDiscussionGroupActionSheetItemNode(theme: theme, context: self.context, channelPeer: self.channelPeer, groupPeer: self.groupPeer, strings: self.strings) + return ChannelDiscussionGroupActionSheetItemNode(theme: theme, context: self.context, channelPeer: self.channelPeer, groupPeer: self.groupPeer, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder) } func updateNode(_ node: ActionSheetItemNode) { @@ -40,7 +43,7 @@ private final class ChannelDiscussionGroupActionSheetItemNode: ActionSheetItemNo private let groupAvatarNode: AvatarNode private let textNode: ImmediateTextNode - init(theme: ActionSheetControllerTheme, context: AccountContext, channelPeer: Peer, groupPeer: Peer, strings: PresentationStrings) { + init(theme: ActionSheetControllerTheme, context: AccountContext, channelPeer: Peer, groupPeer: Peer, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) { self.theme = theme self.channelAvatarNode = AvatarNode(font: avatarFont) @@ -67,9 +70,9 @@ private final class ChannelDiscussionGroupActionSheetItemNode: ActionSheetItemNo let text: (String, [(Int, NSRange)]) if let channelPeer = channelPeer as? TelegramChannel, let addressName = channelPeer.addressName, !addressName.isEmpty { - text = strings.Channel_DiscussionGroup_PublicChannelLink(groupPeer.displayTitle, channelPeer.displayTitle) + text = strings.Channel_DiscussionGroup_PublicChannelLink(groupPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder), channelPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)) } else { - text = strings.Channel_DiscussionGroup_PrivateChannelLink(groupPeer.displayTitle, channelPeer.displayTitle) + text = strings.Channel_DiscussionGroup_PrivateChannelLink(groupPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder), channelPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)) } let attributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: Font.regular(14.0), textColor: theme.primaryTextColor)) for (_, range) in text.1 { diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift index 8ce9d0c849..028cf34979 100644 --- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift @@ -168,9 +168,9 @@ private func channelDiscussionGroupSetupControllerEntries(presentationData: Pres if let linkedDiscussionPeerId = cachedData.linkedDiscussionPeerId { if let group = view.peers[linkedDiscussionPeerId] { if case .group = peer.info { - entries.append(.header(presentationData.theme, presentationData.strings, group.displayTitle, true, presentationData.strings.Channel_DiscussionGroup_HeaderLabel)) + entries.append(.header(presentationData.theme, presentationData.strings, group.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), true, presentationData.strings.Channel_DiscussionGroup_HeaderLabel)) } else { - entries.append(.header(presentationData.theme, presentationData.strings, group.displayTitle, false, presentationData.strings.Channel_DiscussionGroup_HeaderLabel)) + entries.append(.header(presentationData.theme, presentationData.strings, group.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), false, presentationData.strings.Channel_DiscussionGroup_HeaderLabel)) } entries.append(.group(0, presentationData.theme, presentationData.strings, group, presentationData.nameDisplayOrder)) @@ -244,7 +244,8 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI guard let peer = peer else { return } - pushControllerImpl?(context.sharedContext.makeCreateGroupController(context: context, peerIds: [], initialTitle: peer.displayTitle + " Chat", mode: .supergroup, completion: { groupId, dismiss in + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + pushControllerImpl?(context.sharedContext.makeCreateGroupController(context: context, peerIds: [], initialTitle: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) + " Chat", mode: .supergroup, completion: { groupId, dismiss in var applySignal = updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: peerId, groupId: groupId) var cancelImpl: (() -> Void)? let progressSignal = Signal { subscriber in @@ -305,7 +306,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI let presentationData = context.sharedContext.currentPresentationData.with { $0 } let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ - ChannelDiscussionGroupActionSheetItem(context: context, channelPeer: channelPeer, groupPeer: groupPeer, strings: presentationData.strings), + ChannelDiscussionGroupActionSheetItem(context: context, channelPeer: channelPeer, groupPeer: groupPeer, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder), ActionSheetButtonItem(title: presentationData.strings.Channel_DiscussionGroup_LinkGroup, color: .accent, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift index d2cebacf3b..70b6442e39 100644 --- a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift @@ -498,7 +498,7 @@ private func channelInfoEntries(account: Account, presentationData: Presentation if let addressName = peer.addressName, !addressName.isEmpty { discussionGroupTitle = "@\(addressName)" } else { - discussionGroupTitle = peer.displayTitle + discussionGroupTitle = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } } else { discussionGroupTitle = presentationData.strings.Channel_DiscussionGroupAdd @@ -533,7 +533,7 @@ private func channelInfoEntries(account: Account, presentationData: Presentation if let addressName = peer.addressName, !addressName.isEmpty { discussionGroupTitle = "@\(addressName)" } else { - discussionGroupTitle = peer.displayTitle + discussionGroupTitle = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } } else if canEditChannel { discussionGroupTitle = presentationData.strings.Channel_DiscussionGroupAdd @@ -754,7 +754,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos, hasViewButton: false, personalPhoto: false, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)! let _ = currentAvatarMixin.swap(mixin) mixin.requestSearchController = { assetsController in - let controller = WebSearchController(context: context, peer: peer, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer?.displayTitle, completion: { result in + let controller = WebSearchController(context: context, peer: peer, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), completion: { result in assetsController?.dismiss() completedImpl(result) })) diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift index 868c5557bc..05967f1bed 100644 --- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift +++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift @@ -732,7 +732,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod if peer.id == participant.peer.id { label = themeAndStrings.1.Channel_Management_LabelAdministrator } else { - label = themeAndStrings.1.Channel_Management_PromotedBy(peer.displayTitle).0 + label = themeAndStrings.1.Channel_Management_PromotedBy(peer.displayTitle(strings: themeAndStrings.1, displayOrder: themeAndStrings.3)).0 } } } @@ -759,7 +759,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod switch participant.participant { case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { - label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle).0 + label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle(strings: themeAndStrings.1, displayOrder: themeAndStrings.3)).0 } default: break @@ -1012,7 +1012,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod if peer.id == participant.peer.id { label = themeAndStrings.1.Channel_Management_LabelAdministrator } else { - label = themeAndStrings.1.Channel_Management_PromotedBy(peer.displayTitle).0 + label = themeAndStrings.1.Channel_Management_PromotedBy(peer.displayTitle(strings: themeAndStrings.1, displayOrder: themeAndStrings.3)).0 } } } @@ -1039,7 +1039,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod switch participant.participant { case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { - label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle).0 + label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle(strings: themeAndStrings.1, displayOrder: themeAndStrings.3)).0 } default: break diff --git a/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift b/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift index f8b524c140..9f088b255a 100644 --- a/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift @@ -517,10 +517,10 @@ private func confirmChannelOwnershipTransferController(context: AccountContext, var text: String if isGroup { title = presentationData.strings.Group_OwnershipTransfer_Title - text = presentationData.strings.Group_OwnershipTransfer_DescriptionInfo(peer.displayTitle, member.displayTitle).0 + text = presentationData.strings.Group_OwnershipTransfer_DescriptionInfo(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), member.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 } else { title = presentationData.strings.Channel_OwnershipTransfer_Title - text = presentationData.strings.Channel_OwnershipTransfer_DescriptionInfo(peer.displayTitle, member.displayTitle).0 + text = presentationData.strings.Channel_OwnershipTransfer_DescriptionInfo(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), member.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 } let attributedTitle = NSAttributedString(string: title, font: Font.medium(17.0), textColor: theme.primaryColor, paragraphAlignment: .center) diff --git a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift index 7e86cdc436..9489cdaec2 100644 --- a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift +++ b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift @@ -17,6 +17,7 @@ import MediaResources import ItemListAvatarAndNameInfoItem import Geocoding import ItemListAddressItem +import LocalizedPeerData private enum DeviceContactInfoAction { case sendMessage @@ -598,7 +599,7 @@ private func deviceContactInfoEntries(account: Account, presentationData: Presen var personName: (String, String) = (contactData.basicData.firstName, contactData.basicData.lastName) if let editingName = editingName { switch editingName { - case let .personName(firstName, lastName): + case let .personName(firstName, lastName, _): personName = (firstName, lastName) default: break @@ -803,7 +804,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device initialState.nextPhoneNumber += 1 } } - initialState.editingState = DeviceContactInfoEditingState(editingName: .personName(firstName: firstName, lastName: lastName)) + initialState.editingState = DeviceContactInfoEditingState(editingName: .personName(firstName: firstName, lastName: lastName, phone: "")) } let statePromise = ValuePromise(initialState, ignoreRepeated: true) let stateValue = Atomic(value: initialState) @@ -1053,7 +1054,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device } } var composedContactData: DeviceContactExtendedData? - if let editingName = state.editingState?.editingName, case let .personName(firstName, lastName) = editingName, (!firstName.isEmpty || !lastName.isEmpty) { + if let editingName = state.editingState?.editingName, case let .personName(firstName, lastName, _) = editingName, (!firstName.isEmpty || !lastName.isEmpty) { var urls = filteredData.urls if let createForPeer = createForPeer { let appProfile = DeviceContactUrlData(appProfile: createForPeer.id) diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift index a7da7f8276..01e9f90f7d 100644 --- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift +++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift @@ -37,6 +37,7 @@ import NotificationSoundSelectionUI import ItemListAddressItem import AppBundle import Markdown +import LocalizedPeerData private final class GroupInfoArguments { let context: AccountContext @@ -872,7 +873,7 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa if let addressName = peer.addressName, !addressName.isEmpty { peerTitle = "@\(addressName)" } else { - peerTitle = peer.displayTitle + peerTitle = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) } entries.append(GroupInfoEntry.linkedChannelSetup(presentationData.theme, presentationData.strings.Group_LinkedChannel, peerTitle)) } @@ -1434,7 +1435,7 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos, hasViewButton: false, personalPhoto: false, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)! let _ = currentAvatarMixin.swap(mixin) mixin.requestSearchController = { assetsController in - let controller = WebSearchController(context: context, peer: peer, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer?.displayTitle, completion: { result in + let controller = WebSearchController(context: context, peer: peer, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), completion: { result in assetsController?.dismiss() completedImpl(result) })) @@ -1627,7 +1628,7 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: let result = ValuePromise() let presentationData = context.sharedContext.currentPresentationData.with { $0 } if let contactsController = contactsController { - let alertController = textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddParticipantConfirmation(peer.displayTitle).0, actions: [ + let alertController = textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddParticipantConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0, actions: [ TextAlertAction(type: .genericAction, title: presentationData.strings.Common_No, action: { result.set(false) }), @@ -2029,7 +2030,8 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: guard let peer = peerView.peers[peerView.peerId] else { return } - let mapMedia = TelegramMediaMap(latitude: location.latitude, longitude: location.longitude, geoPlace: nil, venue: MapVenue(title: peer.displayTitle, address: location.address, provider: nil, id: nil, type: nil), liveBroadcastingTimeout: nil) + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let mapMedia = TelegramMediaMap(latitude: location.latitude, longitude: location.longitude, geoPlace: nil, venue: MapVenue(title: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), address: location.address, provider: nil, id: nil, type: nil), liveBroadcastingTimeout: nil) let controller = legacyLocationController(message: nil, mapMedia: mapMedia, context: context, openPeer: { _ in }, sendLiveLocation: { _, _ in }, stopLiveLocation: {}, openUrl: { url in context.sharedContext.applicationBindings.openUrl(url) }) diff --git a/submodules/PeerInfoUI/Sources/SecretChatKeyControllerNode.swift b/submodules/PeerInfoUI/Sources/SecretChatKeyControllerNode.swift index 44de3f4f84..f0c374bbd3 100644 --- a/submodules/PeerInfoUI/Sources/SecretChatKeyControllerNode.swift +++ b/submodules/PeerInfoUI/Sources/SecretChatKeyControllerNode.swift @@ -8,6 +8,7 @@ import TelegramPresentationData import TextFormat import AccountContext import EncryptionKeyVisualization +import LocalizedPeerData private func processHexString(_ string: String) -> String { var result = "" diff --git a/submodules/PeerInfoUI/Sources/UserInfoController.swift b/submodules/PeerInfoUI/Sources/UserInfoController.swift index ab225a3a6c..45dbdc1dd2 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoController.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoController.swift @@ -24,6 +24,7 @@ import PeerAvatarGalleryUI import NotificationMuteSettingsUI import NotificationSoundSelectionUI import Markdown +import LocalizedPeerData private final class UserInfoControllerArguments { let account: Account @@ -1031,9 +1032,9 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe } else { let text: String if value { - text = presentationData.strings.UserInfo_BlockConfirmation(peer.displayTitle).0 + text = presentationData.strings.UserInfo_BlockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 } else { - text = presentationData.strings.UserInfo_UnblockConfirmation(peer.displayTitle).0 + text = presentationData.strings.UserInfo_UnblockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0 } presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_No, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Yes, action: { updatePeerBlockedDisposable.set(requestUpdatePeerIsBlocked(account: context.account, peerId: peer.id, isBlocked: value).start()) @@ -1254,7 +1255,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe } } - if let updateName = updateName, case let .personName(firstName, lastName) = updateName { + if let updateName = updateName, case let .personName(firstName, lastName, _) = updateName { updatePeerNameDisposable.set((updateContactName(account: context.account, peerId: peerId, firstName: firstName, lastName: lastName) |> deliverOnMainQueue).start(error: { _ in updateState { state in diff --git a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift index 29eae2ebf4..6fa6314344 100644 --- a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift +++ b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift @@ -10,6 +10,7 @@ import AvatarNode import PeerOnlineMarkerNode import LegacyComponents import ContextUI +import LocalizedPeerData private let avatarFont = UIFont(name: ".SFCompactRounded-Semibold", size: 24.0)! private let textFont = Font.regular(11.0) @@ -86,7 +87,7 @@ public final class SelectablePeerNode: ASDisplayNode { didSet { if !self.theme.isEqual(to: oldValue) { if let peer = self.peer, let mainPeer = peer.chatMainPeer { - self.textNode.attributedText = NSAttributedString(string: mainPeer.displayTitle, font: textFont, textColor: self.currentSelected ? self.theme.selectedTextColor : (peer.peerId.namespace == Namespaces.Peer.SecretChat ? self.theme.secretTextColor : self.theme.textColor), paragraphAlignment: .center) + self.textNode.attributedText = NSAttributedString(string: mainPeer.debugDisplayTitle, font: textFont, textColor: self.currentSelected ? self.theme.selectedTextColor : (peer.peerId.namespace == Namespaces.Peer.SecretChat ? self.theme.secretTextColor : self.theme.textColor), paragraphAlignment: .center) } } } diff --git a/submodules/SettingsUI/Sources/EditSettingsController.swift b/submodules/SettingsUI/Sources/EditSettingsController.swift index 9ef3fbd6dc..36e95ca95f 100644 --- a/submodules/SettingsUI/Sources/EditSettingsController.swift +++ b/submodules/SettingsUI/Sources/EditSettingsController.swift @@ -396,7 +396,7 @@ func editSettingsController(context: AccountContext, currentName: ItemListAvatar } var updateNameSignal: Signal = .complete() - if let updateName = updateName, case let .personName(firstName, lastName) = updateName { + if let updateName = updateName, case let .personName(firstName, lastName, _) = updateName { updateNameSignal = updateAccountPeerName(account: context.account, firstName: firstName, lastName: lastName) } var updateBioSignal: Signal = .complete() diff --git a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift index 0e7221789b..86274b8168 100644 --- a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift +++ b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift @@ -299,13 +299,13 @@ private func notificationsExceptionEntries(presentationData: PresentationData, s var index: Int = 0 for (_, value) in state.mode.settings.filter({ (_, value) in if let query = query, !query.isEmpty { - return !value.peer.displayTitle.lowercased().components(separatedBy: " ").filter { $0.hasPrefix(query.lowercased())}.isEmpty + return !value.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder).lowercased().components(separatedBy: " ").filter { $0.hasPrefix(query.lowercased())}.isEmpty } else { return true } }).sorted(by: { lhs, rhs in - let lhsName = lhs.value.peer.displayTitle - let rhsName = rhs.value.peer.displayTitle + let lhsName = lhs.value.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) + let rhsName = rhs.value.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) if let lhsDate = lhs.value.date, let rhsDate = rhs.value.date { return lhsDate > rhsDate @@ -325,7 +325,7 @@ private func notificationsExceptionEntries(presentationData: PresentationData, s return lhsName < rhsName }) { - if !value.peer.displayTitle.isEmpty { + if !value.peer.isDeleted { var title: String var muted = false switch value.settings.muteState { diff --git a/submodules/SettingsUI/Sources/OpenSettings.swift b/submodules/SettingsUI/Sources/OpenSettings.swift index d582d2ed37..2551f27d9d 100644 --- a/submodules/SettingsUI/Sources/OpenSettings.swift +++ b/submodules/SettingsUI/Sources/OpenSettings.swift @@ -50,7 +50,7 @@ func openEditSettings(context: AccountContext, accountsAndPeers: Signal<((Accoun } openEditingDisposable.set((signal |> deliverOnMainQueue).start(next: { peer, cachedData, canAddAccounts in - pushController(editSettingsController(context: context, currentName: .personName(firstName: peer.firstName ?? "", lastName: peer.lastName ?? ""), currentBioText: cachedData.about ?? "", accountManager: context.sharedContext.accountManager, canAddAccounts: canAddAccounts, focusOnItemTag: focusOnItemTag)) + pushController(editSettingsController(context: context, currentName: .personName(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phone: ""), currentBioText: cachedData.about ?? "", accountManager: context.sharedContext.accountManager, canAddAccounts: canAddAccounts, focusOnItemTag: focusOnItemTag)) })) return openEditingDisposable } diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift index a4a3b212ab..1583b35cbf 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift @@ -929,12 +929,14 @@ func selectivePrivacySettingsController(context: AccountContext, kind: Selective } }) - let peerName = context.account.postbox.transaction { transaction -> String in - return (transaction.getPeer(context.account.peerId) as? TelegramUser)?.displayTitle ?? "" + let peer = context.account.postbox.transaction { transaction -> Peer? in + return transaction.getPeer(context.account.peerId) as? TelegramUser } - let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), peerName) |> deliverOnMainQueue - |> map { presentationData, state, peerName -> (ItemListControllerState, (ItemListNodeState, Any)) in + let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), peer) |> deliverOnMainQueue + |> map { presentationData, state, peer -> (ItemListControllerState, (ItemListNodeState, Any)) in + + let peerName = peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let title: String switch kind { @@ -952,7 +954,7 @@ func selectivePrivacySettingsController(context: AccountContext, kind: Selective title = presentationData.strings.Privacy_PhoneNumber } let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false) - let listState = ItemListNodeState(entries: selectivePrivacySettingsControllerEntries(presentationData: presentationData, kind: kind, state: state, peerName: peerName), style: .blocks, animateChanges: false) + let listState = ItemListNodeState(entries: selectivePrivacySettingsControllerEntries(presentationData: presentationData, kind: kind, state: state, peerName: peerName ?? ""), style: .blocks, animateChanges: false) return (controllerState, (listState, arguments)) } |> afterDisposed { diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift index 3e60f02f22..efca27ebba 100644 --- a/submodules/ShareController/Sources/ShareController.swift +++ b/submodules/ShareController/Sources/ShareController.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import TextFormat import AccountContext import ActionSheetPeerItem @@ -96,14 +97,14 @@ private struct CollectableExternalShareItem { let mediaReference: AnyMediaReference? } -private func collectExternalShareItems(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, postbox: Postbox, collectableItems: [CollectableExternalShareItem], takeOne: Bool = true) -> Signal { +private func collectExternalShareItems(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, postbox: Postbox, collectableItems: [CollectableExternalShareItem], takeOne: Bool = true) -> Signal { var signals: [Signal] = [] let authorsPeerIds = collectableItems.compactMap { $0.author } let authorsPromise = Promise<[PeerId: String]>() authorsPromise.set(postbox.transaction { transaction in var result: [PeerId: String] = [:] for peerId in authorsPeerIds { - if let title = transaction.getPeer(peerId)?.displayTitle { + if let title = transaction.getPeer(peerId)?.displayTitle(strings: strings, displayOrder: nameOrder) { result[peerId] = title } } @@ -551,7 +552,7 @@ public final class ShareController: ViewController { } if !displayedError, case .slowmodeActive = error { displayedError = true - strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: strongSelf.presentationData.theme), title: peer.displayTitle, text: strongSelf.presentationData.strings.Chat_SlowmodeSendError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) + strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: strongSelf.presentationData.theme), title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), text: strongSelf.presentationData.strings.Chat_SlowmodeSendError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root)) } }) } @@ -632,7 +633,7 @@ public final class ShareController: ViewController { case .fromExternal: break } - return (collectExternalShareItems(strings: strongSelf.presentationData.strings, dateTimeFormat: strongSelf.presentationData.dateTimeFormat, postbox: strongSelf.currentAccount.postbox, collectableItems: collectableItems, takeOne: !strongSelf.immediateExternalShare) + return (collectExternalShareItems(strings: strongSelf.presentationData.strings, dateTimeFormat: strongSelf.presentationData.dateTimeFormat, nameOrder: strongSelf.presentationData.nameDisplayOrder, postbox: strongSelf.currentAccount.postbox, collectableItems: collectableItems, takeOne: !strongSelf.immediateExternalShare) |> deliverOnMainQueue) |> map { state in switch state { diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift index 099c38cf40..8b430349bb 100644 --- a/submodules/ShareController/Sources/ShareControllerNode.swift +++ b/submodules/ShareController/Sources/ShareControllerNode.swift @@ -618,7 +618,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate } let animated = self.peersContentNode == nil - let peersContentNode = SharePeersContainerNode(sharedContext: self.sharedContext, account: account, switchableAccounts: switchableAccounts, theme: self.presentationData.theme, strings: self.presentationData.strings, peers: peers, accountPeer: accountPeer, controllerInteraction: self.controllerInteraction!, externalShare: self.externalShare, switchToAnotherAccount: { [weak self] in + let peersContentNode = SharePeersContainerNode(sharedContext: self.sharedContext, account: account, switchableAccounts: switchableAccounts, theme: self.presentationData.theme, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder, peers: peers, accountPeer: accountPeer, controllerInteraction: self.controllerInteraction!, externalShare: self.externalShare, switchToAnotherAccount: { [weak self] in self?.switchToAnotherAccount?() }) self.peersContentNode = peersContentNode diff --git a/submodules/ShareController/Sources/SharePeersContainerNode.swift b/submodules/ShareController/Sources/SharePeersContainerNode.swift index 217b8469a7..64c7de10ef 100644 --- a/submodules/ShareController/Sources/SharePeersContainerNode.swift +++ b/submodules/ShareController/Sources/SharePeersContainerNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SwiftSignalKit import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AvatarNode import AccountContext @@ -75,6 +76,7 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode { private let account: Account private let theme: PresentationTheme private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let controllerInteraction: ShareControllerInteraction private let switchToAnotherAccount: () -> Void @@ -104,11 +106,12 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode { let peersValue = Promise<[(RenderedPeer, PeerPresence?)]>() - init(sharedContext: SharedAccountContext, account: Account, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, peers: [(RenderedPeer, PeerPresence?)], accountPeer: Peer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void) { + init(sharedContext: SharedAccountContext, account: Account, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peers: [(RenderedPeer, PeerPresence?)], accountPeer: Peer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void) { self.sharedContext = sharedContext self.account = account self.theme = theme self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.controllerInteraction = controllerInteraction self.accountPeer = accountPeer self.switchToAnotherAccount = switchToAnotherAccount @@ -372,7 +375,7 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode { if peer.peerId == self.accountPeer.id { text = self.strings.DialogList_SavedMessages } else { - text = peer.chatMainPeer?.displayTitle ?? "" + text = peer.chatMainPeer?.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder) ?? "" } if !string.isEmpty { diff --git a/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift b/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift index c5f1ee8aa5..155ee96945 100644 --- a/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift +++ b/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift @@ -5,8 +5,10 @@ import Display import TelegramCore import Postbox import TelegramPresentationData +import TelegramUIPreferences import TextFormat import Markdown +import LocalizedPeerData private let titleFont = Font.regular(12.0) private let subtitleFont = Font.regular(10.0) @@ -20,6 +22,7 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode { private let accountPeerId: PeerId private var theme: PresentationTheme private var strings: PresentationStrings + private var nameDisplayOrder: PresentationPersonNameOrder private let tapAction: () -> Void private let close: () -> Void @@ -36,10 +39,11 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode { private var validLayout: (CGSize, CGFloat, CGFloat)? private var peersAndMode: ([Peer], LocationBroadcastNavigationAccessoryPanelMode, Bool)? - init(accountPeerId: PeerId, theme: PresentationTheme, strings: PresentationStrings, tapAction: @escaping () -> Void, close: @escaping () -> Void) { + init(accountPeerId: PeerId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, tapAction: @escaping () -> Void, close: @escaping () -> Void) { self.accountPeerId = accountPeerId self.theme = theme self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.tapAction = tapAction self.close = close @@ -115,7 +119,7 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode { case .summary: let text: String if peers.count == 1 { - text = self.strings.DialogList_LiveLocationSharingTo(peers[0].displayTitle).0 + text = self.strings.DialogList_LiveLocationSharingTo(peers[0].displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder)).0 } else { text = self.strings.DialogList_LiveLocationChatsCount(Int32(peers.count)) } diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift index 799a8f14d2..a7305120e6 100644 --- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift +++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift @@ -33,7 +33,7 @@ private class MediaHeaderItemNode: ASDisplayNode { self.addSubnode(self.subtitleNode) } - func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, playbackItem: SharedMediaPlaylistItem?, transition: ContainedViewLayoutTransition) -> (NSAttributedString?, NSAttributedString?, Bool) { + func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, playbackItem: SharedMediaPlaylistItem?, transition: ContainedViewLayoutTransition) -> (NSAttributedString?, NSAttributedString?, Bool) { var rateButtonHidden = false var titleString: NSAttributedString? var subtitleString: NSAttributedString? @@ -48,11 +48,11 @@ private class MediaHeaderItemNode: ASDisplayNode { subtitleString = NSAttributedString(string: subtitleText, font: subtitleFont, textColor: theme.rootController.navigationBar.secondaryTextColor) case let .voice(author, peer): rateButtonHidden = false - let titleText: String = author?.displayTitle ?? "" + let titleText: String = author?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "" let subtitleText: String if let peer = peer { if peer is TelegramGroup || peer is TelegramChannel { - subtitleText = peer.displayTitle + subtitleText = peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder) } else { subtitleText = strings.MusicPlayer_VoiceNote } @@ -64,12 +64,12 @@ private class MediaHeaderItemNode: ASDisplayNode { subtitleString = NSAttributedString(string: subtitleText, font: subtitleFont, textColor: theme.rootController.navigationBar.secondaryTextColor) case let .instantVideo(author, peer, timestamp): rateButtonHidden = false - let titleText: String = author?.displayTitle ?? "" + let titleText: String = author?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "" var subtitleText: String if let peer = peer { if peer is TelegramGroup || peer is TelegramChannel { - subtitleText = peer.displayTitle + subtitleText = peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder) } else { subtitleText = strings.Message_VideoMessage } @@ -132,6 +132,7 @@ final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollViewDeleg private var theme: PresentationTheme private var strings: PresentationStrings private var dateTimeFormat: PresentationDateTimeFormat + private var nameDisplayOrder: PresentationPersonNameOrder private let scrollNode: ASScrollNode private var initialContentOffset: CGFloat? @@ -209,6 +210,7 @@ final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollViewDeleg self.theme = presentationData.theme self.strings = presentationData.strings self.dateTimeFormat = presentationData.dateTimeFormat + self.nameDisplayOrder = presentationData.nameDisplayOrder self.scrollNode = ASScrollNode() @@ -361,6 +363,7 @@ final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollViewDeleg func updatePresentationData(_ presentationData: PresentationData) { self.theme = presentationData.theme self.strings = presentationData.strings + self.nameDisplayOrder = presentationData.nameDisplayOrder self.dateTimeFormat = presentationData.dateTimeFormat let maskImage = generateMaskImage(color: self.theme.rootController.navigationBar.backgroundColor) @@ -421,12 +424,12 @@ final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollViewDeleg let inset: CGFloat = 40.0 + leftInset let constrainedSize = CGSize(width: size.width - inset * 2.0, height: size.height) - let (titleString, subtitleString, rateButtonHidden) = self.currentItemNode.updateLayout(size: constrainedSize, leftInset: leftInset, rightInset: rightInset, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, playbackItem: self.playbackItems?.0, transition: transition) + let (titleString, subtitleString, rateButtonHidden) = self.currentItemNode.updateLayout(size: constrainedSize, leftInset: leftInset, rightInset: rightInset, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, playbackItem: self.playbackItems?.0, transition: transition) self.accessibilityAreaNode.accessibilityLabel = "\(titleString?.string ?? ""). \(subtitleString?.string ?? "")" self.rateButton.isHidden = rateButtonHidden - let _ = self.previousItemNode.updateLayout(size: constrainedSize, leftInset: 0.0, rightInset: 0.0, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, playbackItem: self.playbackItems?.1, transition: transition) - let _ = self.nextItemNode.updateLayout(size: constrainedSize, leftInset: 0.0, rightInset: 0.0, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, playbackItem: self.playbackItems?.2, transition: transition) + let _ = self.previousItemNode.updateLayout(size: constrainedSize, leftInset: 0.0, rightInset: 0.0, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, playbackItem: self.playbackItems?.1, transition: transition) + let _ = self.nextItemNode.updateLayout(size: constrainedSize, leftInset: 0.0, rightInset: 0.0, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, playbackItem: self.playbackItems?.2, transition: transition) let constrainedBounds = CGRect(origin: CGPoint(), size: constrainedSize) transition.updateFrame(node: self.scrollNode, frame: constrainedBounds.offsetBy(dx: inset, dy: 0.0)) diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift index 270817cccf..dd7c326179 100644 --- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift +++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift @@ -295,7 +295,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { locationBroadcastAccessoryPanel.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition) } else { let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } - locationBroadcastAccessoryPanel = LocationBroadcastNavigationAccessoryPanel(accountPeerId: self.context.account.peerId, theme: presentationData.theme, strings: presentationData.strings, tapAction: { [weak self] in + locationBroadcastAccessoryPanel = LocationBroadcastNavigationAccessoryPanel(accountPeerId: self.context.account.peerId, theme: presentationData.theme, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, tapAction: { [weak self] in if let strongSelf = self { switch strongSelf.locationBroadcastPanelSource { case .none: @@ -325,7 +325,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { } if let beginTimeAndTimeout = beginTimeAndTimeout { - items.append(LocationBroadcastActionSheetItem(context: strongSelf.context, peer: peer, title: peer.displayTitle, beginTimestamp: beginTimeAndTimeout.0, timeout: beginTimeAndTimeout.1, strings: presentationData.strings, action: { + items.append(LocationBroadcastActionSheetItem(context: strongSelf.context, peer: peer, title: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), beginTimestamp: beginTimeAndTimeout.0, timeout: beginTimeAndTimeout.1, strings: presentationData.strings, action: { dismissAction() if let strongSelf = self { presentLiveLocationController(context: strongSelf.context, peerId: peer.id, controller: strongSelf) @@ -382,7 +382,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { if let closePeers = closePeers, !closePeers.isEmpty { items.append(ActionSheetTextItem(title: presentationData.strings.LiveLocation_MenuChatsCount(Int32(closePeers.count)))) for peer in closePeers { - items.append(ActionSheetButtonItem(title: peer.displayTitle, action: { + items.append(ActionSheetButtonItem(title: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), action: { dismissAction() if let strongSelf = self { presentLiveLocationController(context: strongSelf.context, peerId: peer.id, controller: strongSelf) diff --git a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift index 94e9872336..4f43b871e3 100644 --- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift +++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift @@ -171,7 +171,7 @@ final class CallControllerNode: ASDisplayNode { self.dimNode.isHidden = true } - self.statusNode.title = peer.displayTitle + self.statusNode.title = peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) if hasOther { self.statusNode.subtitle = self.presentationData.strings.Call_AnsweringWithAccount(accountPeer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)).0 diff --git a/submodules/TelegramCallsUI/Sources/PresentationCall.swift b/submodules/TelegramCallsUI/Sources/PresentationCall.swift index 4e0b8870f5..33fca00b04 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationCall.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationCall.swift @@ -404,7 +404,7 @@ public final class PresentationCallImpl: PresentationCall { if let _ = audioSessionControl, previous == nil || previousControl == nil { if !self.reportedIncomingCall { self.reportedIncomingCall = true - self.callKitIntegration?.reportIncomingCall(uuid: self.internalId, handle: "\(self.peerId.id)", displayTitle: self.peer?.displayTitle ?? "Unknown", completion: { [weak self] error in + self.callKitIntegration?.reportIncomingCall(uuid: self.internalId, handle: "\(self.peerId.id)", displayTitle: self.peer?.debugDisplayTitle ?? "Unknown", completion: { [weak self] error in if let error = error { if error.domain == "com.apple.CallKit.error.incomingcall" && (error.code == -3 || error.code == 3) { Logger.shared.log("PresentationCall", "reportIncomingCall device in DND mode") diff --git a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift index 0834ce2425..2cc8b842a6 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift @@ -297,7 +297,7 @@ public final class PresentationCallManagerImpl: PresentationCallManager { guard let strongSelf = self, let peer = peer else { return } - strongSelf.callKitIntegration?.startCall(account: account, peerId: peerId, displayTitle: peer.displayTitle) + strongSelf.callKitIntegration?.startCall(account: account, peerId: peerId, displayTitle: peer.debugDisplayTitle) })) } if let currentCall = self.currentCall { diff --git a/submodules/TelegramCore/TelegramCore/AccountStateReset.swift b/submodules/TelegramCore/TelegramCore/AccountStateReset.swift index dfaf2d39cd..806fdc791a 100644 --- a/submodules/TelegramCore/TelegramCore/AccountStateReset.swift +++ b/submodules/TelegramCore/TelegramCore/AccountStateReset.swift @@ -184,7 +184,7 @@ private struct ResolvedChatListResetRange { let previousPeerIds = transaction.resetChatList(keepPeerNamespaces: [Namespaces.Peer.SecretChat], upperBound: range.local.upperBound ?? ChatListIndex.absoluteUpperBound, lowerBound: range.local.lowerBound) #if DEBUG for peerId in previousPeerIds { - print("pre \(peerId) [\(transaction.getPeer(peerId)?.displayTitle ?? "nil")]") + print("pre \(peerId) [\(transaction.getPeer(peerId)?.debugDisplayTitle ?? "nil")]") } print("pre hash \(range.local.hash)") print("") @@ -193,7 +193,7 @@ private struct ResolvedChatListResetRange { for entry in range.local.entries { switch entry { case let .peer(index, readState, topMessageAttributes, tagSummary, interfaceState): - print("val \(index.messageIndex.id.peerId) [\(transaction.getPeer(index.messageIndex.id.peerId)?.displayTitle ?? "nil")]") + print("val \(index.messageIndex.id.peerId) [\(transaction.getPeer(index.messageIndex.id.peerId)?.debugDisplayTitle ?? "nil")]") combineChatListNamespaceEntryHash(index: index, readState: readState, topMessageAttributes: topMessageAttributes, tagSummary: nil, interfaceState: nil, into: &preRecalculatedHash) default: break @@ -220,7 +220,7 @@ private struct ResolvedChatListResetRange { } } combineChatListNamespaceEntryHash(index: ChatListIndex(pinningIndex: nil, messageIndex: index), readState: range.remote.readStates[index.id.peerId]?[Namespaces.Message.Cloud], topMessageAttributes: topMessageAttributes, tagSummary: nil, interfaceState: nil, into: &hash) - print("upd \(index.id.peerId) [\(transaction.getPeer(index.id.peerId)?.displayTitle ?? "nil")]") + print("upd \(index.id.peerId) [\(transaction.getPeer(index.id.peerId)?.debugDisplayTitle ?? "nil")]") }) print("upd hash \(hash)") #endif diff --git a/submodules/TelegramCore/TelegramCore/PeerUtils.swift b/submodules/TelegramCore/TelegramCore/PeerUtils.swift index 6e3f3d50ba..ae95b69fe0 100644 --- a/submodules/TelegramCore/TelegramCore/PeerUtils.swift +++ b/submodules/TelegramCore/TelegramCore/PeerUtils.swift @@ -9,30 +9,7 @@ public extension Peer { var debugDisplayTitle: String { switch self { case let user as TelegramUser: - return user.name - case let group as TelegramGroup: - return group.title - case let channel as TelegramChannel: - return channel.title - default: - return "" - } - } - - var displayTitle: String { - return self.debugDisplayTitle - } - - var compactDisplayTitle: String { - switch self { - case let user as TelegramUser: - if let firstName = user.firstName { - return firstName - } else if let lastName = user.lastName { - return lastName - } else { - return "" - } + return user.nameOrPhone case let group as TelegramGroup: return group.title case let channel as TelegramChannel: diff --git a/submodules/TelegramCore/TelegramCore/TelegramUser.swift b/submodules/TelegramCore/TelegramCore/TelegramUser.swift index 08e75fe244..f23265ce6c 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramUser.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramUser.swift @@ -76,7 +76,7 @@ public final class TelegramUser: Peer { public let restrictionInfo: PeerAccessRestrictionInfo? public let flags: UserInfoFlags - public var name: String { + public var nameOrPhone: String { if let firstName = self.firstName { if let lastName = self.lastName { return "\(firstName) \(lastName)" @@ -85,6 +85,20 @@ public final class TelegramUser: Peer { } } else if let lastName = self.lastName { return lastName + } else if let phone = self.phone, !phone.isEmpty { + return phone + } else { + return "" + } + } + + public var shortNameOrPhone: String { + if let firstName = self.firstName { + return firstName + } else if let lastName = self.lastName { + return lastName + } else if let phone = self.phone, !phone.isEmpty { + return phone } else { return "" } diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 1e36e54e2a..0ef227b635 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -49,6 +49,7 @@ import MessageReactionListUI import AppBundle import WalletUI import WalletUrl +import LocalizedPeerData public enum ChatControllerPeekActions { case standard @@ -824,7 +825,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G case .default: strongSelf.openUrl(defaultUrl, concealed: false) case let .request(domain, bot, requestWriteAccess): - let controller = chatMessageActionUrlAuthController(context: strongSelf.context, defaultUrl: defaultUrl, domain: domain, bot: bot, requestWriteAccess: requestWriteAccess, displayName: peer.displayTitle, open: { [weak self] authorize, allowWriteAccess in + let controller = chatMessageActionUrlAuthController(context: strongSelf.context, defaultUrl: defaultUrl, domain: domain, bot: bot, requestWriteAccess: requestWriteAccess, displayName: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), open: { [weak self] authorize, allowWriteAccess in if let strongSelf = self { if authorize { strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { @@ -7689,10 +7690,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { let _ = (self.context.account.postbox.loadedPeerWithId(peerId) - |> deliverOnMainQueue).start(next: { peer in - if let peer = peer as? TelegramUser { + |> deliverOnMainQueue).start(next: { [weak self] peer in + if let strongSelf = self, let peer = peer as? TelegramUser { let recipientHandle = INPersonHandle(value: "tg\(peerId.id)", type: .unknown) - let recipient = INPerson(personHandle: recipientHandle, nameComponents: nil, displayName: peer.displayTitle, image: nil, contactIdentifier: nil, customIdentifier: "tg\(peerId.id)") + let recipient = INPerson(personHandle: recipientHandle, nameComponents: nil, displayName: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), image: nil, contactIdentifier: nil, customIdentifier: "tg\(peerId.id)") let intent = INSendMessageIntent(recipients: [recipient], content: nil, groupName: nil, serviceName: nil, sender: nil) let interaction = INInteraction(intent: intent, response: nil) interaction.direction = .outgoing @@ -7713,17 +7714,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G let reminderActivity = NSUserActivity(activityType: "RemindAboutChatIntent") self.reminderActivity = reminderActivity if peer is TelegramGroup { - reminderActivity.title = self.presentationData.strings.Activity_RemindAboutGroup(peer.displayTitle).0 + reminderActivity.title = self.presentationData.strings.Activity_RemindAboutGroup(peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)).0 } else if let channel = peer as? TelegramChannel { if case .broadcast = channel.info { - reminderActivity.title = self.presentationData.strings.Activity_RemindAboutChannel(peer.displayTitle).0 + reminderActivity.title = self.presentationData.strings.Activity_RemindAboutChannel(peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)).0 } else { - reminderActivity.title = self.presentationData.strings.Activity_RemindAboutGroup(peer.displayTitle).0 + reminderActivity.title = self.presentationData.strings.Activity_RemindAboutGroup(peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)).0 } } else { - reminderActivity.title = self.presentationData.strings.Activity_RemindAboutUser(peer.displayTitle).0 + reminderActivity.title = self.presentationData.strings.Activity_RemindAboutUser(peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)).0 } - reminderActivity.userInfo = ["peerId": peerId.toInt64(), "peerTitle": peer.displayTitle] + reminderActivity.userInfo = ["peerId": peerId.toInt64(), "peerTitle": peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)] reminderActivity.isEligibleForHandoff = true reminderActivity.becomeCurrent() } diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index e8b0d009e0..2ca8d803f9 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -465,7 +465,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.navigationBar?.isHidden = true } if self.overlayNavigationBar == nil { - let overlayNavigationBar = ChatOverlayNavigationBar(theme: self.chatPresentationInterfaceState.theme, close: { [weak self] in + let overlayNavigationBar = ChatOverlayNavigationBar(theme: self.chatPresentationInterfaceState.theme, strings: self.chatPresentationInterfaceState.strings, nameDisplayOrder: self.chatPresentationInterfaceState.nameDisplayOrder, close: { [weak self] in self?.dismissAsOverlay() }) overlayNavigationBar.peerView = self.peerView @@ -1190,7 +1190,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { } let panelFrame = dismissedInputContextPanelNode.placement == .overTextInput ? inputContextPanelsOverMainPanelFrame : inputContextPanelsFrame if !dismissedInputContextPanelNode.frame.equalTo(panelFrame) { - dismissedInputContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition, interfaceState: self.chatPresentationInterfaceState) + dismissedInputContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: 0.0, transition: transition, interfaceState: self.chatPresentationInterfaceState) transition.updateFrame(node: dismissedInputContextPanelNode, frame: panelFrame, completion: { _ in frameCompleted = true completed() diff --git a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift index 8758a09b3e..af2532e26e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import TelegramPresentationData import AppBundle +import LocalizedPeerData private protocol ChatEmptyNodeContent { func updateLayout(interfaceState: ChatPresentationInterfaceState, size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift b/submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift index ce9e5af3ee..a227b5b9f4 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift @@ -6,6 +6,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import CheckNode import TextFormat import AccountContext @@ -20,6 +21,7 @@ private func formattedText(_ text: String, color: UIColor, textAlignment: NSText private final class ChatMessageActionUrlAuthAlertContentNode: AlertContentNode { private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let defaultUrl: String private let domain: String private let bot: Peer @@ -60,8 +62,9 @@ private final class ChatMessageActionUrlAuthAlertContentNode: AlertContentNode { } } - init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, defaultUrl: String, domain: String, bot: Peer, requestWriteAccess: Bool, displayName: String, actions: [TextAlertAction]) { + init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, defaultUrl: String, domain: String, bot: Peer, requestWriteAccess: Bool, displayName: String, actions: [TextAlertAction]) { self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.defaultUrl = defaultUrl self.domain = domain self.bot = bot @@ -160,7 +163,7 @@ private final class ChatMessageActionUrlAuthAlertContentNode: AlertContentNode { self.textNode.attributedText = formattedText(strings.Conversation_OpenBotLinkText(self.defaultUrl).0, color: theme.primaryColor, textAlignment: .center) self.authorizeLabelNode.attributedText = formattedText(strings.Conversation_OpenBotLinkLogin(self.domain, self.displayName).0, color: theme.primaryColor) - self.allowWriteLabelNode.attributedText = formattedText(strings.Conversation_OpenBotLinkAllowMessages(self.bot.displayTitle).0, color: theme.primaryColor) + self.allowWriteLabelNode.attributedText = formattedText(strings.Conversation_OpenBotLinkAllowMessages(self.bot.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder)).0, color: theme.primaryColor) self.actionNodesSeparator.backgroundColor = theme.separatorColor for actionNode in self.actionNodes { @@ -314,7 +317,7 @@ func chatMessageActionUrlAuthController(context: AccountContext, defaultUrl: Str open(contentNode.authorize, contentNode.allowWriteAccess) } })] - contentNode = ChatMessageActionUrlAuthAlertContentNode(theme: AlertControllerTheme(presentationTheme: theme), ptheme: theme, strings: strings, defaultUrl: defaultUrl, domain: domain, bot: bot, requestWriteAccess: requestWriteAccess, displayName: displayName, actions: actions) + contentNode = ChatMessageActionUrlAuthAlertContentNode(theme: AlertControllerTheme(presentationTheme: theme), ptheme: theme, strings: strings, nameDisplayOrder: presentationData.nameDisplayOrder, defaultUrl: defaultUrl, domain: domain, bot: bot, requestWriteAccess: requestWriteAccess, displayName: displayName, actions: actions) let controller = AlertController(theme: AlertControllerTheme(presentationTheme: theme), contentNode: contentNode!) dismissImpl = { [weak controller] animated in if animated { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index d743672dd7..8278ac82c7 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -538,7 +538,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if let sourcePeer = item.message.peers[attribute.messageId.peerId] { let inlineBotNameColor = serviceMessageColorComponents(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper).primaryText - let nameString = NSAttributedString(string: sourcePeer.displayTitle, font: inlineBotPrefixFont, textColor: inlineBotNameColor) + let nameString = NSAttributedString(string: sourcePeer.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder), font: inlineBotPrefixFont, textColor: inlineBotNameColor) viaBotApply = viaBotLayout(TextNodeLayoutArguments(attributedString: nameString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0, availableWidth), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) } } @@ -898,7 +898,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { self.item?.controllerInteraction.clickThroughMessage() case .longTap, .doubleTap: if let item = self.item, self.imageNode.frame.contains(location) { - item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, nil) + item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, recognizer) return false } case .hold: diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index 30c19b83f4..a84362dfeb 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -1189,7 +1189,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode } else { if let currentForwardInfo = currentForwardInfo, forwardInfo.author == nil && currentForwardInfo.0 != nil { forwardSource = nil - forwardAuthorSignature = currentForwardInfo.0?.displayTitle + forwardAuthorSignature = currentForwardInfo.0?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) } else { forwardSource = forwardInfo.author forwardAuthorSignature = forwardInfo.authorSignature diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift index a00b50d8b4..4d5c154f50 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift @@ -266,7 +266,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { if let sourcePeer = item.message.peers[attribute.messageId.peerId] { let inlineBotNameColor = serviceMessageColorComponents(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper).primaryText - let nameString = NSAttributedString(string: sourcePeer.displayTitle, font: inlineBotPrefixFont, textColor: inlineBotNameColor) + let nameString = NSAttributedString(string: sourcePeer.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder), font: inlineBotPrefixFont, textColor: inlineBotNameColor) viaBotApply = viaBotLayout(TextNodeLayoutArguments(attributedString: nameString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0, availableWidth), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) } @@ -348,7 +348,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { } else { if let currentForwardInfo = currentForwardInfo, forwardInfo.author == nil && currentForwardInfo.0 != nil { forwardSource = nil - forwardAuthorSignature = currentForwardInfo.0?.displayTitle + forwardAuthorSignature = currentForwardInfo.0?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) } else { forwardSource = forwardInfo.author forwardAuthorSignature = forwardInfo.authorSignature diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift index 25293b3488..a240c4e5da 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift @@ -189,7 +189,7 @@ final class ChatMessageAccessibilityData { } } - let authorName = item.message.author?.displayTitle + let authorName = item.message.author?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) if let chatPeer = item.message.peers[item.message.id.peerId] { let (_, _, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, message: item.message, chatPeer: RenderedPeer(peer: chatPeer), accountPeerId: item.context.account.peerId) @@ -518,7 +518,7 @@ final class ChatMessageAccessibilityData { if label.isEmpty { if let author = item.message.author { if isIncoming { - label = author.displayTitle + label = author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) } else { label = item.presentationData.strings.VoiceOver_Chat_YourMessage } @@ -558,7 +558,7 @@ final class ChatMessageAccessibilityData { let replyLabel: String if replyMessage.flags.contains(.Incoming) { if let author = replyMessage.author { - replyLabel = item.presentationData.strings.VoiceOver_Chat_ReplyFrom(author.displayTitle).0 + replyLabel = item.presentationData.strings.VoiceOver_Chat_ReplyFrom(author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)).0 } else { replyLabel = item.presentationData.strings.VoiceOver_Chat_Reply } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift index 703f156b45..1533bdb7e1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift @@ -338,7 +338,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { if let sourcePeer = item.message.peers[attribute.messageId.peerId] { let inlineBotNameColor = serviceMessageColorComponents(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper).primaryText - let nameString = NSAttributedString(string: sourcePeer.displayTitle, font: inlineBotPrefixFont, textColor: inlineBotNameColor) + let nameString = NSAttributedString(string: sourcePeer.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder), font: inlineBotPrefixFont, textColor: inlineBotNameColor) viaBotApply = viaBotLayout(TextNodeLayoutArguments(attributedString: nameString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0, availableWidth), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift b/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift index 929cfa6772..e474570e89 100644 --- a/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift +++ b/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift @@ -5,11 +5,14 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences private let titleFont = Font.semibold(14.0) final class ChatOverlayNavigationBar: ASDisplayNode { private let theme: PresentationTheme + private let strings: PresentationStrings + private let nameDisplayOrder: PresentationPersonNameOrder private let close: () -> Void private let separatorNode: ASDisplayNode @@ -24,7 +27,7 @@ final class ChatOverlayNavigationBar: ASDisplayNode { var title = "" if let peerView = self.peerView { if let peer = peerViewMainPeer(peerView) { - title = peer.displayTitle + title = peer.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder) } } if self.peerTitle != title { @@ -36,8 +39,10 @@ final class ChatOverlayNavigationBar: ASDisplayNode { } } - init(theme: PresentationTheme, close: @escaping () -> Void) { + init(theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, close: @escaping () -> Void) { self.theme = theme + self.strings = strings + self.nameDisplayOrder = nameDisplayOrder self.close = close self.separatorNode = ASDisplayNode() diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift index 6c2fde1888..5ccbfa8fda 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift @@ -133,14 +133,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] if let peer = peer as? TelegramChannel, case .broadcast = peer.info { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedChannelAbout(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedChannelAbout(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupAbout(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupAbout(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -171,14 +171,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] if let peer = peer as? TelegramChannel, case .broadcast = peer.info { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedChannelUsername(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedChannelUsername(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupUsername(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupUsername(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -235,14 +235,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] if value { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleInvitesOn(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleInvitesOn(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleInvitesOff(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleInvitesOff(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -262,14 +262,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] if value { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleSignaturesOn(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleSignaturesOn(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleSignaturesOff(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageToggleSignaturesOff(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -293,7 +293,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessagePinned(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessagePinned(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -332,7 +332,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageUnpinned(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageUnpinned(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -372,9 +372,9 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let titleText: (String, [(Int, NSRange)]) if mediaUpdated || message.media.isEmpty { - titleText = self.presentationData.strings.Channel_AdminLog_MessageEdited(author?.displayTitle ?? "") + titleText = self.presentationData.strings.Channel_AdminLog_MessageEdited(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "") } else { - titleText = self.presentationData.strings.Channel_AdminLog_CaptionEdited(author?.displayTitle ?? "") + titleText = self.presentationData.strings.Channel_AdminLog_CaptionEdited(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "") } appendAttributedText(text: titleText, generateEntities: { index in @@ -420,7 +420,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageDeleted(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageDeleted(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -528,7 +528,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } if (prevBanInfo == nil || !prevBanInfo!.rights.flags.contains(.banReadMessages)) && newFlags.contains(.banReadMessages) { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageKickedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessageKickedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageKickedName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)) : self.presentationData.strings.Channel_AdminLog_MessageKickedNameUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -539,7 +539,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { }, to: &text, entities: &entities) text += "\n" } else if isBroadcast, newBanInfo == nil, prevBanInfo != nil { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageUnkickedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessageUnkickedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageUnkickedName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)) : self.presentationData.strings.Channel_AdminLog_MessageUnkickedNameUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -549,7 +549,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { return result }, to: &text, entities: &entities) } else { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRestrictedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessageRestrictedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRestrictedName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)) : self.presentationData.strings.Channel_AdminLog_MessageRestrictedNameUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -635,7 +635,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var entities: [MessageTextEntity] = [] if case .member = prev.participant, case .creator = new.participant { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageTransferedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessageTransferedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageTransferedName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)) : self.presentationData.strings.Channel_AdminLog_MessageTransferedNameUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -648,7 +648,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var appendedRightsHeader = false if case let .creator(_, prevRank) = prev.participant, case let .creator(_, newRank) = new.participant, prevRank != newRank { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRankName(new.peer.displayTitle, newRank ?? "") : self.presentationData.strings.Channel_AdminLog_MessageRankUsername(new.peer.displayTitle, "@" + new.peer.addressName!, newRank ?? ""), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRankName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), newRank ?? "") : self.presentationData.strings.Channel_AdminLog_MessageRankUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!, newRank ?? ""), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -691,7 +691,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { if prevFlags.contains(flag) != newFlags.contains(flag) { if !appendedRightsHeader { appendedRightsHeader = true - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessagePromotedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessagePromotedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessagePromotedName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)) : self.presentationData.strings.Channel_AdminLog_MessagePromotedNameUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -726,7 +726,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { return result }, to: &text, entities: &entities) } else { - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRankName(new.peer.displayTitle, newRank ?? "") : self.presentationData.strings.Channel_AdminLog_MessageRankUsername(new.peer.displayTitle, "@" + new.peer.addressName!, newRank ?? ""), generateEntities: { index in + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageRankName(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), newRank ?? "") : self.presentationData.strings.Channel_AdminLog_MessageRankUsername(new.peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder), "@" + new.peer.addressName!, newRank ?? ""), generateEntities: { index in var result: [MessageTextEntityType] = [] if index == 0 { result.append(.TextMention(peerId: new.peer.id)) @@ -767,14 +767,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var entities: [MessageTextEntity] = [] if new != nil { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupStickerPack(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupStickerPack(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageRemovedGroupStickerPack(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageRemovedGroupStickerPack(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -797,14 +797,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var entities: [MessageTextEntity] = [] if !value { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryVisible(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryVisible(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryHidden(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryHidden(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } @@ -888,7 +888,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let titleText: (String, [(Int, NSRange)]) - titleText = self.presentationData.strings.Channel_AdminLog_PollStopped(author?.displayTitle ?? "") + titleText = self.presentationData.strings.Channel_AdminLog_PollStopped(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "") appendAttributedText(text: titleText, generateEntities: { index in if index == 0, let author = author { @@ -931,7 +931,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { if let updated = updated { if let peer = peer as? TelegramChannel, case .group = peer.info { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedLinkedChannel(author?.displayTitle ?? "", updated.displayTitle), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedLinkedChannel(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "", updated.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } else if index == 1 { @@ -940,7 +940,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedLinkedGroup(author?.displayTitle ?? "", updated.displayTitle), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedLinkedGroup(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "", updated.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder)), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } else if index == 1 { @@ -951,7 +951,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } else { if let peer = peer as? TelegramChannel, case .group = peer.info { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedUnlinkedChannel(author?.displayTitle ?? "", previous?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedUnlinkedChannel(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "", previous?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } else if index == 1, let previous = previous { @@ -960,7 +960,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedUnlinkedGroup(author?.displayTitle ?? "", previous?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedUnlinkedGroup(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "", previous?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } else if index == 0, let previous = previous { @@ -1014,14 +1014,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var entities: [MessageTextEntity] = [] if let newValue = newValue { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_SetSlowmode(author?.displayTitle ?? "", shortTimeIntervalString(strings: self.presentationData.strings, value: newValue)), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_SetSlowmode(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? "", shortTimeIntervalString(strings: self.presentationData.strings, value: newValue)), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } return [] }, to: &text, entities: &entities) } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_DisabledSlowmode(author?.displayTitle ?? ""), generateEntities: { index in + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_DisabledSlowmode(author?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""), generateEntities: { index in if index == 0, let author = author { return [.TextMention(peerId: author.id)] } diff --git a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift index fb8f187f1b..8a0deb2a6f 100644 --- a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import Postbox import TelegramCore import TelegramPresentationData +import LocalizedPeerData private enum ChatReportPeerTitleButton: Equatable { case block diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift index 17f3743ca1..8700928a5d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import TelegramPresentationData import SearchBarNode +import LocalizedPeerData private let searchBarFont = Font.regular(17.0) diff --git a/submodules/TelegramUI/TelegramUI/ChatTitleView.swift b/submodules/TelegramUI/TelegramUI/ChatTitleView.swift index cd9c0c1077..ed95d49d55 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTitleView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTitleView.swift @@ -12,6 +12,7 @@ import ActivityIndicator import TelegramStringFormatting import PeerPresenceStatusManager import ChatTitleActivityNode +import LocalizedPeerData enum ChatTitleContent { case peer(peerView: PeerView, onlineMemberCount: Int32?, isScheduledMessages: Bool) diff --git a/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift b/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift index 45a29d94c2..fd3b076927 100644 --- a/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift +++ b/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift @@ -183,7 +183,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection displayCountAlert = true updatedState = updatedState.withToggledPeerId(.peer(peer.id)) } else { - addedToken = EditableTokenListToken(id: peer.id, title: peer.displayTitle) + addedToken = EditableTokenListToken(id: peer.id, title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)) } } updatedCount = updatedState.selectedPeerIndices.count diff --git a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift index b38b598f2c..1f0270c5dc 100644 --- a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift @@ -219,8 +219,8 @@ public func createChannelController(context: AccountContext) -> ViewController { switch editingName { case let .title(title, type): current.editingName = .title(title: String(title.prefix(255)), type: type) - case let .personName(firstName, lastName): - current.editingName = .personName(firstName: String(firstName.prefix(255)), lastName: String(lastName.prefix(255))) + case let .personName(firstName, lastName, _): + current.editingName = .personName(firstName: String(firstName.prefix(255)), lastName: String(lastName.prefix(255)), phone: "") } return current } diff --git a/submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift index 6e0003995b..22942e4ebe 100644 --- a/submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift @@ -7,6 +7,7 @@ import SwiftSignalKit import Display import TelegramPresentationData import AccountContext +import LocalizedPeerData func textStringForForwardedMessage(_ message: Message, strings: PresentationStrings) -> (String, Bool) { for media in message.media { diff --git a/submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift b/submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift index 7593e987f2..0d5dc1072b 100644 --- a/submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift +++ b/submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift @@ -12,7 +12,7 @@ private func accountInfo(account: Account) -> Signal if let addressName = peer.addressName { return "\(addressName)" } - return peer.displayTitle + return peer.debugDisplayTitle } let primaryDatacenterId = Int32(account.network.datacenterId) diff --git a/submodules/TelegramUI/TelegramUI/MediaManager.swift b/submodules/TelegramUI/TelegramUI/MediaManager.swift index 5d0ed83bd9..757b670ea3 100644 --- a/submodules/TelegramUI/TelegramUI/MediaManager.swift +++ b/submodules/TelegramUI/TelegramUI/MediaManager.swift @@ -239,11 +239,11 @@ public final class MediaManagerImpl: NSObject, MediaManager { nowPlayingInfo[MPMediaItemPropertyTitle] = titleText nowPlayingInfo[MPMediaItemPropertyArtist] = subtitleText case let .voice(author, _): - let titleText: String = author?.displayTitle ?? "" + let titleText: String = author?.debugDisplayTitle ?? "" nowPlayingInfo[MPMediaItemPropertyTitle] = titleText case let .instantVideo(author, _, _): - let titleText: String = author?.displayTitle ?? "" + let titleText: String = author?.debugDisplayTitle ?? "" nowPlayingInfo[MPMediaItemPropertyTitle] = titleText } diff --git a/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift index 2a380fbadf..1ba7d57003 100644 --- a/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift @@ -8,6 +8,7 @@ import TelegramPresentationData import MergeLists import TextFormat import AccountContext +import LocalizedPeerData private struct MentionChatInputContextPanelEntry: Comparable, Identifiable { let index: Int @@ -58,7 +59,7 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode { private var currentEntries: [MentionChatInputContextPanelEntry]? private var enqueuedTransitions: [(CommandChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, mode: MentionChatInputContextPanelMode) { self.mode = mode @@ -203,9 +204,9 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode { return max(size.height - minimumItemHeights, 0.0) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) if self.theme !== interfaceState.theme { self.theme = interfaceState.theme diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift index 952b7d16c3..05c1cb865f 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift @@ -16,6 +16,7 @@ import OpenInExternalAppUI import PeerInfoUI import ContextUI import PresentationDataUtils +import LocalizedPeerData public class PeerMediaCollectionController: TelegramBaseController { private var validLayout: ContainerViewLayout? diff --git a/submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift b/submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift index 642ecb9bc1..4027d3d731 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift @@ -127,7 +127,7 @@ final class MessageMediaPlaylistItem: SharedMediaPlaylistItem { } } - return SharedMediaPlaybackDisplayData.music(title: file.fileName ?? "", performer: self.message.effectiveAuthor?.displayTitle ?? "", albumArt: nil, long: false) + return SharedMediaPlaybackDisplayData.music(title: file.fileName ?? "", performer: self.message.effectiveAuthor?.debugDisplayTitle ?? "", albumArt: nil, long: false) } return nil } diff --git a/submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift b/submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift index 76cd02a9ea..e829817bb0 100644 --- a/submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift @@ -159,7 +159,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode { let headerString: String if let message = message, message.flags.contains(.Incoming), let author = message.author { - headerString = "Reply to message. From: \(author.displayTitle)" + headerString = "Reply to message. From: \(author.displayTitle(strings: strings, displayOrder: nameDisplayOrder))" } else if let message = message, !message.flags.contains(.Incoming) { headerString = "Reply to your message" } else { diff --git a/submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift b/submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift index 9db5b7f077..64da067476 100644 --- a/submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift @@ -5,6 +5,7 @@ import Display import TelegramCore import Postbox import SwiftSignalKit +import LocalizedPeerData final class SecretChatHandshakeStatusInputPanelNode: ChatInputPanelNode { private let button: HighlightableButtonNode diff --git a/submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift b/submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift index e25fa61511..1c8efd89e2 100644 --- a/submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift +++ b/submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift @@ -5,6 +5,7 @@ import SwiftSignalKit import Postbox import TelegramCore import TelegramPresentationData +import TelegramUIPreferences import TelegramCallsUI import AccountContext @@ -410,7 +411,7 @@ public final class SharedNotificationManager { } private var currentNotificationCall: (peer: Peer?, internalId: CallSessionInternalId)? - private func updateNotificationCall(call: (peer: Peer?, internalId: CallSessionInternalId)?, strings: PresentationStrings) { + private func updateNotificationCall(call: (peer: Peer?, internalId: CallSessionInternalId)?, strings: PresentationStrings, nameOrder: PresentationPersonNameOrder) { if let previousCall = currentNotificationCall { if #available(iOS 10.0, *) { let center = UNUserNotificationCenter.current() @@ -428,7 +429,7 @@ public final class SharedNotificationManager { self.currentNotificationCall = call if let notificationCall = call { - let rawText = strings.PUSH_PHONE_CALL_REQUEST(notificationCall.peer?.displayTitle ?? "").0 + let rawText = strings.PUSH_PHONE_CALL_REQUEST(notificationCall.peer?.displayTitle(strings: strings, displayOrder: nameOrder) ?? "").0 let title: String? let body: String if let index = rawText.firstIndex(of: "|") { @@ -501,11 +502,11 @@ public final class SharedNotificationManager { } } |> distinctUntilChanged(isEqual: { $0?.1 == $1?.1 })).start(next: { [weak self] peerAndInternalId in - self?.updateNotificationCall(call: peerAndInternalId, strings: strings) + self?.updateNotificationCall(call: peerAndInternalId, strings: strings, nameOrder: .firstLast) })) } else { self.notificationCallStateDisposable.set(nil) - self.updateNotificationCall(call: nil, strings: strings) + self.updateNotificationCall(call: nil, strings: strings, nameOrder: .firstLast) } } } diff --git a/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift b/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift index 697dbed30a..4ccf68bca9 100644 --- a/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift +++ b/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift @@ -226,7 +226,7 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor switch requestCategory { case .admins: if let query = adminQuery { - return members?.filter({$0.peer.displayTitle.lowercased().components(separatedBy: " ").contains(where: {$0.hasPrefix(query.lowercased())})}) + return members?.filter({$0.peer.debugDisplayTitle.lowercased().components(separatedBy: " ").contains(where: {$0.hasPrefix(query.lowercased())})}) } default: break diff --git a/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift b/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift index db3587dd99..5803478fbc 100644 --- a/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift +++ b/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift @@ -312,9 +312,9 @@ private func galleryItems(account: Account, results: [ChatContextResult], curren return (galleryItems, focusItem) } -func presentLegacyWebSearchGallery(context: AccountContext, peer: Peer?, theme: PresentationTheme, results: [ChatContextResult], current: ChatContextResult, selectionContext: TGMediaSelectionContext?, editingContext: TGMediaEditingContext, updateHiddenMedia: @escaping (String?) -> Void, initialLayout: ContainerViewLayout?, transitionHostView: @escaping () -> UIView?, transitionView: @escaping (ChatContextResult) -> UIView?, completed: @escaping (ChatContextResult) -> Void, present: (ViewController, Any?) -> Void) { - let legacyController = LegacyController(presentation: .custom, theme: theme, initialLayout: nil) - legacyController.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style +func presentLegacyWebSearchGallery(context: AccountContext, peer: Peer?, presentationData: PresentationData, results: [ChatContextResult], current: ChatContextResult, selectionContext: TGMediaSelectionContext?, editingContext: TGMediaEditingContext, updateHiddenMedia: @escaping (String?) -> Void, initialLayout: ContainerViewLayout?, transitionHostView: @escaping () -> UIView?, transitionView: @escaping (ChatContextResult) -> UIView?, completed: @escaping (ChatContextResult) -> Void, present: (ViewController, Any?) -> Void) { + let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme, initialLayout: nil) + legacyController.statusBar.statusBarStyle = presentationData.theme.rootController.statusBarStyle.style let controller = TGModernGalleryController(context: legacyController.context)! controller.asyncTransitionIn = true @@ -322,9 +322,9 @@ func presentLegacyWebSearchGallery(context: AccountContext, peer: Peer?, theme: let (items, focusItem) = galleryItems(account: context.account, results: results, current: current, selectionContext: selectionContext, editingContext: editingContext) - let model = TGMediaPickerGalleryModel(context: legacyController.context, items: items, focus: focusItem, selectionContext: selectionContext, editingContext: editingContext, hasCaptions: false, allowCaptionEntities: true, hasTimer: false, onlyCrop: false, inhibitDocumentCaptions: false, hasSelectionPanel: false, hasCamera: false, recipientName: peer?.displayTitle)! + let model = TGMediaPickerGalleryModel(context: legacyController.context, items: items, focus: focusItem, selectionContext: selectionContext, editingContext: editingContext, hasCaptions: false, allowCaptionEntities: true, hasTimer: false, onlyCrop: false, inhibitDocumentCaptions: false, hasSelectionPanel: false, hasCamera: false, recipientName: peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder))! if let peer = peer { - model.suggestionContext = legacySuggestionContext(account: context.account, peerId: peer.id) + model.suggestionContext = legacySuggestionContext(context: context, peerId: peer.id) } controller.model = model model.controller = controller diff --git a/submodules/WebSearchUI/Sources/WebSearchController.swift b/submodules/WebSearchUI/Sources/WebSearchController.swift index 2deb8cc17b..9d636caffc 100644 --- a/submodules/WebSearchUI/Sources/WebSearchController.swift +++ b/submodules/WebSearchUI/Sources/WebSearchController.swift @@ -283,7 +283,7 @@ public final class WebSearchController: ViewController { } override public func loadDisplayNode() { - self.displayNode = WebSearchControllerNode(context: self.context, theme: self.interfaceState.presentationData.theme, strings: interfaceState.presentationData.strings, controllerInteraction: self.controllerInteraction!, peer: self.peer, mode: self.mode.mode) + self.displayNode = WebSearchControllerNode(context: self.context, presentationData: self.interfaceState.presentationData, controllerInteraction: self.controllerInteraction!, peer: self.peer, mode: self.mode.mode) self.controllerNode.requestUpdateInterfaceState = { [weak self] animated, f in if let strongSelf = self { strongSelf.updateInterfaceState(f) diff --git a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift index d43d0b9f1f..a7edcf2165 100644 --- a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift +++ b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift @@ -129,6 +129,7 @@ class WebSearchControllerNode: ASDisplayNode { private let peer: Peer? private var theme: PresentationTheme private var strings: PresentationStrings + private var presentationData: PresentationData private let mode: WebSearchMode private let controllerInteraction: WebSearchControllerInteraction @@ -177,10 +178,11 @@ class WebSearchControllerNode: ASDisplayNode { var cancel: (() -> Void)? var dismissInput: (() -> Void)? - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, controllerInteraction: WebSearchControllerInteraction, peer: Peer?, mode: WebSearchMode) { + init(context: AccountContext, presentationData: PresentationData, controllerInteraction: WebSearchControllerInteraction, peer: Peer?, mode: WebSearchMode) { self.context = context - self.theme = theme - self.strings = strings + self.theme = presentationData.theme + self.strings = presentationData.strings + self.presentationData = presentationData self.controllerInteraction = controllerInteraction self.peer = peer self.mode = mode @@ -266,7 +268,7 @@ class WebSearchControllerNode: ASDisplayNode { entries.append(WebSearchRecentQueryEntry(index: i, query: queries[i])) } - let header = ChatListSearchItemHeader(type: .recentPeers, theme: interfaceState.presentationData.theme, strings:interfaceState.presentationData.strings, actionTitle: strings.WebSearch_RecentSectionClear, action: { + let header = ChatListSearchItemHeader(type: .recentPeers, theme: interfaceState.presentationData.theme, strings: interfaceState.presentationData.strings, actionTitle: interfaceState.presentationData.strings.WebSearch_RecentSectionClear, action: { _ = clearRecentWebSearchQueries(postbox: strongSelf.context.account.postbox).start() }) @@ -687,7 +689,7 @@ class WebSearchControllerNode: ASDisplayNode { if self.controllerInteraction.selectionState != nil { if let state = self.webSearchInterfaceState.state, state.scope == .images { if let results = self.currentProcessedResults?.results { - presentLegacyWebSearchGallery(context: self.context, peer: self.peer, theme: self.theme, results: results, current: currentResult, selectionContext: self.controllerInteraction.selectionState, editingContext: self.controllerInteraction.editingState, updateHiddenMedia: { [weak self] id in + presentLegacyWebSearchGallery(context: self.context, peer: self.peer, presentationData: self.presentationData, results: results, current: currentResult, selectionContext: self.controllerInteraction.selectionState, editingContext: self.controllerInteraction.editingState, updateHiddenMedia: { [weak self] id in self?.hiddenMediaId.set(.single(id)) }, initialLayout: self.containerLayout?.0, transitionHostView: { [weak self] in return self?.gridNode.view diff --git a/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift b/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift index 776a41727b..9e38774c0b 100644 --- a/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift +++ b/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift @@ -114,7 +114,7 @@ class WebSearchGalleryController: ViewController { self?.dismiss(forceAway: true) }, selectionState: selectionState, editingState: editingState) - if let title = peer?.displayTitle { + if let title = peer?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) { let recipientNode = GalleryNavigationRecipientNode(color: .white, title: title) let leftItem = UIBarButtonItem(customDisplayNode: recipientNode) self.navigationItem.leftBarButtonItem = leftItem From 9a568ca9dabbb6303e19366a07eaf62670cb1c4c Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:06:03 +0400 Subject: [PATCH 05/34] ASButtonNode: disable asynchronous image loading --- submodules/AsyncDisplayKit/Source/ASButtonNode.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode.mm index f91b16c2bd..828996bc9f 100644 --- a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm +++ b/submodules/AsyncDisplayKit/Source/ASButtonNode.mm @@ -71,6 +71,8 @@ ASLockScopeSelf(); if (!_imageNode) { _imageNode = [[ASImageNode alloc] init]; + _imageNode.displayWithoutProcessing = true; + _imageNode.displaysAsynchronously = false; [_imageNode setLayerBacked:YES]; } return _imageNode; @@ -81,6 +83,8 @@ ASLockScopeSelf(); if (!_backgroundImageNode) { _backgroundImageNode = [[ASImageNode alloc] init]; + _backgroundImageNode.displayWithoutProcessing = true; + _backgroundImageNode.displaysAsynchronously = false; [_backgroundImageNode setLayerBacked:YES]; [_backgroundImageNode setContentMode:UIViewContentModeScaleToFill]; } From 8a559e2799280de70041db7293cc1002efdfe43b Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:06:26 +0400 Subject: [PATCH 06/34] Ask one more time when removing chats for both sides --- .../Sources/ChatListController.swift | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 2b914fde47..90a3c9f6cf 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -18,6 +18,7 @@ import DeleteChatPeerActionSheetItem import LanguageSuggestionUI import ContextUI import AppBundle +import LocalizedPeerData public func useSpecialTabBarIcons() -> Bool { return (Date(timeIntervalSince1970: 1545642000)...Date(timeIntervalSince1970: 1546387200)).contains(Date()) @@ -1526,13 +1527,23 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) var items: [ActionSheetItem] = [] - items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: self.presentationData.strings)) + items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder)) items.append(ActionSheetButtonItem(title: self.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.compactDisplayTitle).0, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() - self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: deleteGloballyIfPossible, completion: { - removed() - }) - completion(true) + guard let strongSelf = self else { + return + } + strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: strongSelf.presentationData.theme), title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationTitle, text: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationText, actions: [ + TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { + completion(false) + }), + TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationAction, action: { + self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: deleteGloballyIfPossible, completion: { + removed() + }) + completion(true) + }) + ], parseMarkdown: true), in: .window(.root)) })) items.append(ActionSheetButtonItem(title: self.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() @@ -1552,6 +1563,18 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, ]) ]) self.present(actionSheet, in: .window(.root)) + } else if peer.peerId == self.context.account.peerId { + self.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: self.presentationData.theme), title: self.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationTitle, text: self.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationText, actions: [ + TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_Cancel, action: { + completion(false) + }), + TextAlertAction(type: .destructiveAction, title: self.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationAction, action: { [weak self] in + self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: deleteGloballyIfPossible, completion: { + removed() + }) + completion(true) + }) + ], parseMarkdown: true), in: .window(.root)) } else { completion(true) self.schedulePeerChatRemoval(peer: peer, type: .forLocalPeer, deleteGloballyIfPossible: deleteGloballyIfPossible, completion: { From f4a21f9729e0ba1d9c88832683bea113e6db7e4c Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:07:36 +0400 Subject: [PATCH 07/34] Support modal preview in contact search --- .../Sources/ContactsControllerNode.swift | 20 ++++++++++------ .../Sources/ContactsSearchContainerNode.swift | 23 ++++++++++++++----- .../InviteContactsControllerNode.swift | 2 +- .../TelegramUI/ComposeControllerNode.swift | 2 +- .../ContactSelectionControllerNode.swift | 2 +- .../PeerSelectionControllerNode.swift | 2 +- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift index 4295a9cb24..6ebb64baf6 100644 --- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift @@ -134,13 +134,7 @@ final class ContactsControllerNode: ASDisplayNode { } contextAction = { [weak self] peer, node, gesture in - guard let strongSelf = self, let contactsController = strongSelf.controller else { - return - } - let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) - chatController.canReadHistory.set(false) - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: contactContextMenuItems(context: strongSelf.context, peerId: peer.id, contactsController: contactsController), reactionItems: [], gesture: gesture) - contactsController.presentInGlobalOverlay(contextController) + self?.contextAction(peer: peer, node: node, gesture: gesture) } } @@ -185,6 +179,16 @@ final class ContactsControllerNode: ASDisplayNode { self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) } + private func contextAction(peer: Peer, node: ASDisplayNode, gesture: ContextGesture?) { + guard let contactsController = self.controller else { + return + } + let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) + chatController.canReadHistory.set(false) + let contextController = ContextController(account: self.context.account, theme: self.presentationData.theme, strings: self.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: contactContextMenuItems(context: self.context, peerId: peer.id, contactsController: contactsController), reactionItems: [], gesture: gesture) + contactsController.presentInGlobalOverlay(contextController) + } + func activateSearch(placeholderNode: SearchBarPlaceholderNode) { guard let (containerLayout, navigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else { return @@ -194,6 +198,8 @@ final class ContactsControllerNode: ASDisplayNode { if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch { requestOpenPeerFromSearch(peer) } + }, contextAction: { [weak self] peer, node, gesture in + self?.contextAction(peer: peer, node: node, gesture: gesture) }), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { requestDeactivateSearch() diff --git a/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift b/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift index b4e2f186cf..874cd29f5a 100644 --- a/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift @@ -12,6 +12,7 @@ import AccountContext import SearchUI import ChatListSearchItemHeader import ContactsPeerItem +import ContextUI private enum ContactListSearchGroup { case contacts @@ -65,7 +66,7 @@ private struct ContactListSearchEntry: Identifiable, Comparable { return lhs.index < rhs.index } - func item(account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ListViewItem { + func item(account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ListViewItem { let header: ListViewItemHeader let status: ContactsPeerItemStatus switch self.group { @@ -88,15 +89,23 @@ private struct ContactListSearchEntry: Identifiable, Comparable { status = .none } let peer = self.peer + var nativePeer: Peer? let peerItem: ContactsPeerItemPeer switch peer { case let .peer(peer, _, _): peerItem = .peer(peer: peer, chatPeer: peer) + nativePeer = peer case let .deviceContact(stableId, contact): peerItem = .deviceContact(stableId: stableId, contact: contact) } return ContactsPeerItem(theme: self.theme, strings: self.strings, sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, account: account, peerMode: .peer, peer: peerItem, status: status, enabled: self.enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in openPeer(peer) + }, contextAction: contextAction.flatMap { contextAction in + return nativePeer.flatMap { nativePeer in + return { node, gesture in + contextAction(nativePeer, node, gesture) + } + } }) } } @@ -108,12 +117,12 @@ struct ContactListSearchContainerTransition { let isSearching: Bool } -private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ContactListSearchContainerTransition { +private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ContactListSearchContainerTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer, contextAction: contextAction), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer, contextAction: contextAction), directionHint: nil) } return ContactListSearchContainerTransition(deletions: deletions, insertions: insertions, updates: updates, isSearching: isSearching) } @@ -133,6 +142,7 @@ public struct ContactsSearchCategories: OptionSet { public final class ContactsSearchContainerNode: SearchDisplayControllerContentNode { private let context: AccountContext private let openPeer: (ContactListPeer) -> Void + private let contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)? private let dimNode: ASDisplayNode public let listNode: ListView @@ -146,9 +156,10 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo private var containerViewLayout: (ContainerViewLayout, CGFloat)? private var enqueuedTransitions: [ContactListSearchContainerTransition] = [] - public init(context: AccountContext, onlyWriteable: Bool, categories: ContactsSearchCategories, filters: [ContactListFilter] = [.excludeSelf], openPeer: @escaping (ContactListPeer) -> Void) { + public init(context: AccountContext, onlyWriteable: Bool, categories: ContactsSearchCategories, filters: [ContactListFilter] = [.excludeSelf], openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) { self.context = context self.openPeer = openPeer + self.contextAction = contextAction self.presentationData = context.sharedContext.currentPresentationData.with { $0 } @@ -312,7 +323,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo let transition = contactListSearchContainerPreparedRecentTransition(from: previousItems, to: items ?? [], isSearching: items != nil, account: context.account, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, timeFormat: strongSelf.presentationData.dateTimeFormat, openPeer: { peer in self?.listNode.clearHighlightAnimated(true) self?.openPeer(peer) - }) + }, contextAction: strongSelf.contextAction) strongSelf.enqueueTransition(transition) } diff --git a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift index 6d806e19b1..e5e0deaa0b 100644 --- a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift @@ -528,7 +528,7 @@ final class InviteContactsControllerNode: ASDisplayNode { strongSelf.selectionState = strongSelf.selectionState.withSelectedContactId(id) strongSelf.requestDeactivateSearch?() } - }), cancel: { [weak self] in + }, contextAction: nil), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { requestDeactivateSearch() } diff --git a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift index 3481cd10c7..acf0778355 100644 --- a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift @@ -121,7 +121,7 @@ final class ComposeControllerNode: ASDisplayNode { if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch, case let .peer(peer, _, _) = peer { requestOpenPeerFromSearch(peer.id) } - }), cancel: { [weak self] in + }, contextAction: nil), cancel: { [weak self] in self?.requestDeactivateSearch?() }) diff --git a/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift index 065fcb111e..57101e0684 100644 --- a/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift @@ -122,7 +122,7 @@ final class ContactSelectionControllerNode: ASDisplayNode { } self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: categories, openPeer: { [weak self] peer in self?.requestOpenPeerFromSearch?(peer) - }), cancel: { [weak self] in + }, contextAction: nil), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { requestDeactivateSearch() } diff --git a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift index b29f5fae37..2a225c2207 100644 --- a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift @@ -270,7 +270,7 @@ final class PeerSelectionControllerNode: ASDisplayNode { break } } - }), cancel: { [weak self] in + }, contextAction: nil), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { requestDeactivateSearch() } From cbf1e62c465fdf918dcfcddb7bd1ab449b6515ea Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:08:12 +0400 Subject: [PATCH 08/34] Allow pan to select on context actions --- .../Sources/ContextActionsContainerNode.swift | 68 ++++++++++++++++++- .../ContextUI/Sources/ContextController.swift | 62 +++++++++++++---- .../ContextUI/Sources/ContextGesture.swift | 16 +++++ 3 files changed, 131 insertions(+), 15 deletions(-) diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift index ad251153c8..e1c5a9fb21 100644 --- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift +++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift @@ -3,6 +3,35 @@ import AsyncDisplayKit import Display import TelegramPresentationData +private final class ContextActionsSelectionGestureRecognizer: UIPanGestureRecognizer { + var updateLocation: ((CGPoint, Bool) -> Void)? + var completed: ((Bool) -> Void)? + + override func touchesBegan(_ touches: Set, with event: UIEvent) { + super.touchesBegan(touches, with: event) + + self.updateLocation?(touches.first!.location(in: self.view), false) + } + + override func touchesMoved(_ touches: Set, with event: UIEvent) { + super.touchesMoved(touches, with: event) + + self.updateLocation?(touches.first!.location(in: self.view), true) + } + + override func touchesEnded(_ touches: Set, with event: UIEvent) { + super.touchesEnded(touches, with: event) + + self.completed?(true) + } + + override func touchesCancelled(_ touches: Set, with event: UIEvent) { + super.touchesCancelled(touches, with: event) + + self.completed?(false) + } +} + private enum ContextItemNode { case action(ContextActionNode) case itemSeparator(ASDisplayNode) @@ -12,8 +41,14 @@ private enum ContextItemNode { final class ContextActionsContainerNode: ASDisplayNode { private var effectView: UIVisualEffectView? private var itemNodes: [ContextItemNode] + private let feedbackTap: () -> Void - init(theme: PresentationTheme, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) { + private(set) var gesture: UIGestureRecognizer? + private var currentHighlightedActionNode: ContextActionNode? + + init(theme: PresentationTheme, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void) { + self.feedbackTap = feedbackTap + var itemNodes: [ContextItemNode] = [] for i in 0 ..< items.count { switch items[i] { @@ -43,6 +78,7 @@ final class ContextActionsContainerNode: ASDisplayNode { self.itemNodes.forEach({ itemNode in switch itemNode { case let .action(actionNode): + actionNode.isUserInteractionEnabled = false self.addSubnode(actionNode) case let .itemSeparator(separatorNode): self.addSubnode(separatorNode) @@ -50,6 +86,36 @@ final class ContextActionsContainerNode: ASDisplayNode { self.addSubnode(separatorNode) } }) + + let gesture = ContextActionsSelectionGestureRecognizer(target: nil, action: nil) + self.gesture = gesture + gesture.updateLocation = { [weak self] point, moved in + guard let strongSelf = self else { + return + } + let actionNode = strongSelf.actionNode(at: point) + if actionNode !== strongSelf.currentHighlightedActionNode { + if actionNode != nil, moved { + strongSelf.feedbackTap() + } + strongSelf.currentHighlightedActionNode?.setIsHighlighted(false) + } + strongSelf.currentHighlightedActionNode = actionNode + actionNode?.setIsHighlighted(true) + } + gesture.completed = { [weak self] performAction in + guard let strongSelf = self else { + return + } + if let currentHighlightedActionNode = strongSelf.currentHighlightedActionNode { + strongSelf.currentHighlightedActionNode = nil + currentHighlightedActionNode.setIsHighlighted(false) + if performAction { + currentHighlightedActionNode.performAction() + } + } + } + self.view.addGestureRecognizer(gesture) } func updateLayout(widthClass: ContainerViewLayoutSizeClass, constrainedWidth: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize { diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index 3208dee1e5..280af73552 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -65,6 +65,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private var items: Signal<[ContextMenuItem], NoError> private let beginDismiss: (ContextMenuActionResult) -> Void private let reactionSelected: (String) -> Void + private let beganAnimatingOut: () -> Void private let getController: () -> ContextController? private weak var gesture: ContextGesture? @@ -105,13 +106,14 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private let itemsDisposable = MetaDisposable() - init(account: Account, controller: ContextController, theme: PresentationTheme, strings: PresentationStrings, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], beginDismiss: @escaping (ContextMenuActionResult) -> Void, recognizer: TapLongTapOrDoubleTapGestureRecognizer?, gesture: ContextGesture?, reactionSelected: @escaping (String) -> Void) { + init(account: Account, controller: ContextController, theme: PresentationTheme, strings: PresentationStrings, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], beginDismiss: @escaping (ContextMenuActionResult) -> Void, recognizer: TapLongTapOrDoubleTapGestureRecognizer?, gesture: ContextGesture?, reactionSelected: @escaping (String) -> Void, beganAnimatingOut: @escaping () -> Void) { self.theme = theme self.strings = strings self.source = source self.items = items self.beginDismiss = beginDismiss self.reactionSelected = reactionSelected + self.beganAnimatingOut = beganAnimatingOut self.gesture = gesture self.getController = { [weak controller] in @@ -152,10 +154,14 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self.contentContainerNode = ContextContentContainerNode() + var feedbackTap: (() -> Void)? + self.actionsContainerNode = ContextActionsContainerNode(theme: theme, items: [], getController: { [weak controller] in return controller }, actionSelected: { result in beginDismiss(result) + }, feedbackTap: { + feedbackTap?() }) if !reactionItems.isEmpty { @@ -167,6 +173,10 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi super.init() + feedbackTap = { [weak self] in + self?.hapticFeedback.tap() + } + self.scrollNode.view.delegate = self self.view.addSubview(self.effectView) @@ -586,6 +596,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi } func animateOut(result initialResult: ContextMenuActionResult, completion: @escaping () -> Void) { + self.beganAnimatingOut() + var transitionDuration: Double = 0.2 var transitionCurve: ContainedViewLayoutTransitionCurve = .easeInOut @@ -945,6 +957,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi return self?.getController() }, actionSelected: { [weak self] result in self?.beginDismiss(result) + }, feedbackTap: { [weak self] in + self?.hapticFeedback.tap() }) self.scrollNode.insertSubnode(self.actionsContainerNode, aboveSubnode: previousActionsContainerNode) @@ -1088,12 +1102,24 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi let isInitialLayout = self.actionsContainerNode.frame.size.width.isZero let previousContainerFrame = self.view.convert(self.contentContainerNode.frame, from: self.scrollNode.view) - let actionsSize = self.actionsContainerNode.updateLayout(widthClass: layout.metrics.widthClass, constrainedWidth: layout.size.width - actionsSideInset * 2.0, transition: actionsContainerTransition) - let contentScale = (layout.size.width - actionsSideInset * 2.0) / layout.size.width + let constrainedWidth: CGFloat + if layout.size.width < layout.size.height { + constrainedWidth = layout.size.width + } else { + constrainedWidth = floor(layout.size.width / 2.0) + } + + let actionsSize = self.actionsContainerNode.updateLayout(widthClass: layout.metrics.widthClass, constrainedWidth: constrainedWidth - actionsSideInset * 2.0, transition: actionsContainerTransition) + let contentScale = (constrainedWidth - actionsSideInset * 2.0) / constrainedWidth var contentUnscaledSize: CGSize if case .compact = layout.metrics.widthClass { - let proposedContentHeight = layout.size.height - topEdge - contentActionsSpacing - actionsSize.height - layout.intrinsicInsets.bottom - actionsBottomInset - contentUnscaledSize = CGSize(width: layout.size.width, height: max(400.0, proposedContentHeight)) + let proposedContentHeight: CGFloat + if layout.size.width < layout.size.height { + proposedContentHeight = layout.size.height - topEdge - contentActionsSpacing - actionsSize.height - layout.intrinsicInsets.bottom - actionsBottomInset + } else { + proposedContentHeight = layout.size.height - topEdge - topEdge + } + contentUnscaledSize = CGSize(width: constrainedWidth, height: max(100.0, proposedContentHeight)) if let preferredSize = contentParentNode.controller.preferredContentSizeForLayout(ContainerViewLayout(size: contentUnscaledSize, metrics: LayoutMetrics(widthClass: .compact, heightClass: .compact), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false)) { contentUnscaledSize = preferredSize @@ -1115,16 +1141,22 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi var originalContentFrame: CGRect var contentHeight: CGFloat if case .compact = layout.metrics.widthClass { - originalActionsFrame = CGRect(origin: CGPoint(x: actionsSideInset, y: min(maximumActionsFrameOrigin, floor((layout.size.height - contentActionsSpacing - contentSize.height) / 2.0) + contentSize.height + contentActionsSpacing)), size: actionsSize) - originalContentFrame = CGRect(origin: CGPoint(x: actionsSideInset, y: originalActionsFrame.minY - contentActionsSpacing - contentSize.height), size: contentSize) - if originalContentFrame.minY < topEdge { - let requiredOffset = topEdge - originalContentFrame.minY - let availableOffset = max(0.0, layout.size.height - layout.intrinsicInsets.bottom - actionsBottomInset - originalActionsFrame.maxY) - let offset = min(requiredOffset, availableOffset) - originalActionsFrame = originalActionsFrame.offsetBy(dx: 0.0, dy: offset) - originalContentFrame = originalContentFrame.offsetBy(dx: 0.0, dy: offset) + if layout.size.width < layout.size.height { + originalActionsFrame = CGRect(origin: CGPoint(x: actionsSideInset, y: min(maximumActionsFrameOrigin, floor((layout.size.height - contentActionsSpacing - contentSize.height) / 2.0) + contentSize.height + contentActionsSpacing)), size: actionsSize) + originalContentFrame = CGRect(origin: CGPoint(x: actionsSideInset, y: originalActionsFrame.minY - contentActionsSpacing - contentSize.height), size: contentSize) + if originalContentFrame.minY < topEdge { + let requiredOffset = topEdge - originalContentFrame.minY + let availableOffset = max(0.0, layout.size.height - layout.intrinsicInsets.bottom - actionsBottomInset - originalActionsFrame.maxY) + let offset = min(requiredOffset, availableOffset) + originalActionsFrame = originalActionsFrame.offsetBy(dx: 0.0, dy: offset) + originalContentFrame = originalContentFrame.offsetBy(dx: 0.0, dy: offset) + } + contentHeight = max(layout.size.height, max(layout.size.height, originalActionsFrame.maxY + actionsBottomInset) - originalContentFrame.minY + contentTopInset) + } else { + originalContentFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width - actionsSideInset - actionsSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 2.0)), size: contentSize) + originalActionsFrame = CGRect(origin: CGPoint(x: originalContentFrame.maxX + actionsSideInset, y: max(topEdge, originalContentFrame.minY)), size: actionsSize) + contentHeight = max(layout.size.height, max(originalContentFrame.maxY, originalActionsFrame.maxY)) } - contentHeight = max(layout.size.height, max(layout.size.height, originalActionsFrame.maxY + actionsBottomInset) - originalContentFrame.minY + contentTopInset) } else { originalContentFrame = CGRect(origin: CGPoint(x: floor(originalProjectedContentViewFrame.1.midX - contentSize.width / 2.0), y: floor(originalProjectedContentViewFrame.1.midY - contentSize.height / 2.0)), size: contentSize) originalContentFrame.origin.x = min(originalContentFrame.origin.x, layout.size.width - actionsSideInset - contentSize.width) @@ -1342,6 +1374,8 @@ public final class ContextController: ViewController, StandalonePresentableContr return } strongSelf.reactionSelected?(value) + }, beganAnimatingOut: { [weak self] in + self?.statusBar.statusBarStyle = .Ignore }) self.displayNodeDidLoad() diff --git a/submodules/ContextUI/Sources/ContextGesture.swift b/submodules/ContextUI/Sources/ContextGesture.swift index e415027bc6..e6c7c1a078 100644 --- a/submodules/ContextUI/Sources/ContextGesture.swift +++ b/submodules/ContextUI/Sources/ContextGesture.swift @@ -37,6 +37,19 @@ private func cancelParentGestures(view: UIView) { } } +private func cancelOtherGestures(gesture: ContextGesture, view: UIView) { + if let gestureRecognizers = view.gestureRecognizers { + for recognizer in gestureRecognizers { + if let recognizer = recognizer as? ContextGesture, recognizer !== gesture { + recognizer.cancel() + } + } + } + for subview in view.subviews { + cancelOtherGestures(gesture: gesture, view: subview) + } +} + public final class ContextGesture: UIGestureRecognizer, UIGestureRecognizerDelegate { private var currentProgress: CGFloat = 0.0 private var delayTimer: Timer? @@ -104,6 +117,9 @@ public final class ContextGesture: UIGestureRecognizer, UIGestureRecognizerDeleg strongSelf.animator?.invalidate() strongSelf.activated?(strongSelf) if let view = strongSelf.view?.superview { + if let window = view.window { + cancelOtherGestures(gesture: strongSelf, view: window) + } cancelParentGestures(view: view) } strongSelf.state = .began From f32baad111f7ee9da05a9c71ef4737b608bc83ec Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:09:45 +0400 Subject: [PATCH 09/34] Manage global overlay controllers via NavigationController --- .../GlobalOverlayPresentationContext.swift | 3 +- .../Display/Display/KeyboardManager.swift | 20 --- .../Navigation/NavigationController.swift | 142 ++++++++++++++++-- .../Display/Display/WindowContent.swift | 6 + 4 files changed, 141 insertions(+), 30 deletions(-) diff --git a/submodules/Display/Display/GlobalOverlayPresentationContext.swift b/submodules/Display/Display/GlobalOverlayPresentationContext.swift index 9f99cb5a52..2292200781 100644 --- a/submodules/Display/Display/GlobalOverlayPresentationContext.swift +++ b/submodules/Display/Display/GlobalOverlayPresentationContext.swift @@ -3,7 +3,7 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -private func isViewVisibleInHierarchy(_ view: UIView, _ initial: Bool = true) -> Bool { +func isViewVisibleInHierarchy(_ view: UIView, _ initial: Bool = true) -> Bool { guard let window = view.window else { return false } @@ -182,6 +182,7 @@ final class GlobalOverlayPresentationContext { self.readyChanged(wasReady: wasReady) } else if self.ready { for controller in self.controllers { + transition.updateFrame(node: controller.displayNode, frame: CGRect(origin: CGPoint(), size: layout.size)) controller.containerLayoutUpdated(layout, transition: transition) } } diff --git a/submodules/Display/Display/KeyboardManager.swift b/submodules/Display/Display/KeyboardManager.swift index b1089f1f83..67e903a8e0 100644 --- a/submodules/Display/Display/KeyboardManager.swift +++ b/submodules/Display/Display/KeyboardManager.swift @@ -19,26 +19,6 @@ private func getFirstResponder(_ view: UIView) -> UIView? { } } -private func isViewVisibleInHierarchy(_ view: UIView, _ initial: Bool = true) -> Bool { - guard let window = view.window else { - return false - } - if view.isHidden || view.alpha == 0.0 { - return false - } - if view.superview === window { - return true - } else if let superview = view.superview { - if initial && view.frame.minY >= superview.frame.height { - return false - } else { - return isViewVisibleInHierarchy(superview, false) - } - } else { - return false - } -} - class KeyboardManager { private let host: StatusBarHost diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift index e8f48eef76..04a77b3b4e 100644 --- a/submodules/Display/Display/Navigation/NavigationController.swift +++ b/submodules/Display/Display/Navigation/NavigationController.swift @@ -92,6 +92,19 @@ private enum RootContainer { case split(NavigationSplitContainer) } +private final class GlobalOverlayContainerParent: ASDisplayNode { + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + if let subnodes = self.subnodes { + for node in subnodes.reversed() { + if let result = node.view.hitTest(point, with: event) { + return result + } + } + } + return nil + } +} + open class NavigationController: UINavigationController, ContainableController, UIGestureRecognizerDelegate { public var isOpaqueWhenInOverlay: Bool = true public var blocksBackgroundWhenInOverlay: Bool = true @@ -128,6 +141,8 @@ open class NavigationController: UINavigationController, ContainableController, private var rootModalFrame: NavigationModalFrame? private var modalContainers: [NavigationModalContainer] = [] private var overlayContainers: [NavigationOverlayContainer] = [] + private var globalOverlayContainers: [NavigationOverlayContainer] = [] + private var globalOverlayContainerParent: GlobalOverlayContainerParent? private var validLayout: ContainerViewLayout? private var validStatusBarStyle: NavigationStatusBarStyle? private var validStatusBarHidden: Bool = false @@ -239,6 +254,18 @@ open class NavigationController: UINavigationController, ContainableController, supportedOrientations = supportedOrientations.intersection(controller.supportedOrientations) } } + for overlayContrainer in self.globalOverlayContainers { + let controller = overlayContrainer.controller + if controller.lockOrientation { + if let lockedOrientation = controller.lockedOrientation { + supportedOrientations = supportedOrientations.intersection(ViewControllerSupportedOrientations(regularSize: lockedOrientation, compactSize: lockedOrientation)) + } else { + supportedOrientations = supportedOrientations.intersection(ViewControllerSupportedOrientations(regularSize: currentOrientationToLock, compactSize: currentOrientationToLock)) + } + } else { + supportedOrientations = supportedOrientations.intersection(controller.supportedOrientations) + } + } return supportedOrientations } @@ -286,6 +313,35 @@ open class NavigationController: UINavigationController, ContainableController, } } + var overlayLayout = layout + + if let globalOverlayContainerParent = self.globalOverlayContainerParent { + let portraitSize = CGSize(width: min(layout.size.width, layout.size.height), height: max(layout.size.width, layout.size.height)) + let screenSize = UIScreen.main.bounds.size + let portraitScreenSize = CGSize(width: min(screenSize.width, screenSize.height), height: max(screenSize.width, screenSize.height)) + if portraitSize.width != portraitScreenSize.width || portraitSize.height != portraitScreenSize.height { + if globalOverlayContainerParent.view.superview != self.displayNode.view { + self.displayNode.addSubnode(globalOverlayContainerParent) + } + + overlayLayout.size.height = overlayLayout.size.height - (layout.inputHeight ?? 0.0) + overlayLayout.inputHeight = nil + overlayLayout.inputHeightIsInteractivellyChanging = false + } else if layout.inputHeight == nil { + if globalOverlayContainerParent.view.superview != self.displayNode.view { + self.displayNode.addSubnode(globalOverlayContainerParent) + } + } else { + if let statusBarHost = self.statusBarHost, let keyboardWindow = statusBarHost.keyboardWindow, let keyboardView = statusBarHost.keyboardView, !keyboardView.frame.height.isZero, isViewVisibleInHierarchy(keyboardView) { + if globalOverlayContainerParent.view.superview != keyboardWindow { + keyboardWindow.addSubnode(globalOverlayContainerParent) + } + } else if globalOverlayContainerParent.view.superview !== self.displayNode.view { + self.displayNode.addSubnode(globalOverlayContainerParent) + } + } + } + if let globalScrollToTopNode = self.globalScrollToTopNode { globalScrollToTopNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -1.0), size: CGSize(width: layout.size.width, height: 1.0)) } @@ -301,6 +357,10 @@ open class NavigationController: UINavigationController, ContainableController, self.inCallStatusBar?.frame = inCallStatusBarFrame } + if let globalOverlayContainerParent = self.globalOverlayContainerParent { + transition.updateFrame(node: globalOverlayContainerParent, frame: CGRect(origin: CGPoint(), size: layout.size)) + } + let navigationLayout = makeNavigationLayout(mode: self.mode, layout: layout, controllers: self._viewControllers) var transition = transition @@ -375,8 +435,51 @@ open class NavigationController: UINavigationController, ContainableController, } self.modalContainers = modalContainers - var previousOverlayContainer: NavigationOverlayContainer? var topVisibleOverlayContainerWithStatusBar: NavigationOverlayContainer? + + var previousGlobalOverlayContainer: NavigationOverlayContainer? + for i in (0 ..< self.globalOverlayContainers.count).reversed() { + let overlayContainer = self.globalOverlayContainers[i] + + let containerTransition: ContainedViewLayoutTransition + if overlayContainer.supernode == nil { + containerTransition = .immediate + } else { + containerTransition = transition + } + + containerTransition.updateFrame(node: overlayContainer, frame: CGRect(origin: CGPoint(), size: overlayLayout.size)) + overlayContainer.update(layout: overlayLayout, transition: containerTransition) + + if overlayContainer.supernode == nil && overlayContainer.isReady { + if let previousGlobalOverlayContainer = previousGlobalOverlayContainer { + self.globalOverlayContainerParent?.insertSubnode(overlayContainer, belowSubnode: previousGlobalOverlayContainer) + } else { + self.globalOverlayContainerParent?.addSubnode(overlayContainer) + } + overlayContainer.transitionIn() + } + + if overlayContainer.supernode != nil { + previousGlobalOverlayContainer = overlayContainer + let controllerStatusBarStyle = overlayContainer.controller.statusBar.statusBarStyle + switch controllerStatusBarStyle { + case .Black, .White, .Hide: + if topVisibleOverlayContainerWithStatusBar == nil { + topVisibleOverlayContainerWithStatusBar = overlayContainer + } + if case .Hide = controllerStatusBarStyle { + statusBarHidden = true + } else { + statusBarHidden = overlayContainer.controller.statusBar.alpha.isZero + } + case .Ignore: + break + } + } + } + + var previousOverlayContainer: NavigationOverlayContainer? for i in (0 ..< self.overlayContainers.count).reversed() { let overlayContainer = self.overlayContainers[i] @@ -395,7 +498,9 @@ open class NavigationController: UINavigationController, ContainableController, self.displayNode.insertSubnode(overlayContainer, belowSubnode: previousOverlayContainer) } else if let globalScrollToTopNode = self.globalScrollToTopNode { self.displayNode.insertSubnode(overlayContainer, belowSubnode: globalScrollToTopNode) - } else { + } else if let globalOverlayContainerParent = self.globalOverlayContainerParent { + self.displayNode.insertSubnode(overlayContainer, belowSubnode: globalOverlayContainerParent) + }else { self.displayNode.addSubnode(overlayContainer) } overlayContainer.transitionIn() @@ -814,6 +919,10 @@ open class NavigationController: UINavigationController, ContainableController, }) self.displayNode.addSubnode(globalScrollToTopNode) self.globalScrollToTopNode = globalScrollToTopNode + + let globalOverlayContainerParent = GlobalOverlayContainerParent() + self.displayNode.addSubnode(globalOverlayContainerParent) + self.globalOverlayContainerParent = globalOverlayContainerParent } public func pushViewController(_ controller: ViewController) { @@ -957,12 +1066,23 @@ open class NavigationController: UINavigationController, ContainableController, guard let strongSelf = self else { return } - for i in 0 ..< strongSelf.overlayContainers.count { - let overlayContainer = strongSelf.overlayContainers[i] - if overlayContainer.controller === controller { - overlayContainer.removeFromSupernode() - strongSelf.overlayContainers.remove(at: i) - break + if inGlobal { + for i in 0 ..< strongSelf.globalOverlayContainers.count { + let overlayContainer = strongSelf.globalOverlayContainers[i] + if overlayContainer.controller === controller { + overlayContainer.removeFromSupernode() + strongSelf.globalOverlayContainers.remove(at: i) + break + } + } + } else { + for i in 0 ..< strongSelf.overlayContainers.count { + let overlayContainer = strongSelf.overlayContainers[i] + if overlayContainer.controller === controller { + overlayContainer.removeFromSupernode() + strongSelf.overlayContainers.remove(at: i) + break + } } } if let layout = strongSelf.validLayout { @@ -976,7 +1096,11 @@ open class NavigationController: UINavigationController, ContainableController, strongSelf.updateContainers(layout: layout, transition: transition) } }) - self.overlayContainers.append(container) + if inGlobal { + self.globalOverlayContainers.append(container) + } else { + self.overlayContainers.append(container) + } container.isReadyUpdated = { [weak self, weak container] in guard let strongSelf = self, let container = container else { return diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index df2db57107..2b815235b8 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -1106,6 +1106,12 @@ public class Window1 { } public func presentInGlobalOverlay(_ controller: ContainableController) { + if let controller = controller as? ViewController { + if let navigationController = self._rootController as? NavigationController { + navigationController.presentOverlay(controller: controller, inGlobal: true) + return + } + } self.overlayPresentationContext.present(controller) } From b01c3d9b098e66033501f3c082a36b9cb12e36dd Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:10:08 +0400 Subject: [PATCH 10/34] Support markdown in standardTextAlertController --- .../Display/Display/TextAlertController.swift | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/submodules/Display/Display/TextAlertController.swift b/submodules/Display/Display/TextAlertController.swift index a302bb0611..2f88965a46 100644 --- a/submodules/Display/Display/TextAlertController.swift +++ b/submodules/Display/Display/TextAlertController.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import AsyncDisplayKit +import Markdown private let alertWidth: CGFloat = 270.0 @@ -354,9 +355,19 @@ public func textAlertController(theme: AlertControllerTheme, title: NSAttributed return AlertController(theme: theme, contentNode: TextAlertContentNode(theme: theme, title: title, text: text, actions: actions, actionLayout: actionLayout)) } -public func standardTextAlertController(theme: AlertControllerTheme, title: String?, text: String, actions: [TextAlertAction], actionLayout: TextAlertContentActionLayout = .horizontal, allowInputInset: Bool = true) -> AlertController { +public func standardTextAlertController(theme: AlertControllerTheme, title: String?, text: String, actions: [TextAlertAction], actionLayout: TextAlertContentActionLayout = .horizontal, allowInputInset: Bool = true, parseMarkdown: Bool = false) -> AlertController { var dismissImpl: (() -> Void)? - let controller = AlertController(theme: theme, contentNode: TextAlertContentNode(theme: theme, title: title != nil ? NSAttributedString(string: title!, font: Font.semibold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center) : nil, text: NSAttributedString(string: text, font: title == nil ? Font.semibold(17.0) : Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center), actions: actions.map { action in + let attributedText: NSAttributedString + if parseMarkdown { + let font = title == nil ? Font.semibold(17.0) : Font.regular(13.0) + let boldFont = title == nil ? Font.bold(17.0) : Font.semibold(13.0) + let body = MarkdownAttributeSet(font: font, textColor: theme.primaryColor) + let bold = MarkdownAttributeSet(font: boldFont, textColor: theme.primaryColor) + attributedText = parseMarkdownIntoAttributedString(text, attributes: MarkdownAttributes(body: body, bold: bold, link: body, linkAttribute: { _ in nil }), textAlignment: .center) + } else { + attributedText = NSAttributedString(string: text, font: title == nil ? Font.semibold(17.0) : Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center) + } + let controller = AlertController(theme: theme, contentNode: TextAlertContentNode(theme: theme, title: title != nil ? NSAttributedString(string: title!, font: Font.semibold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center) : nil, text: attributedText, actions: actions.map { action in return TextAlertAction(type: action.type, title: action.title, action: { dismissImpl?() action.action() From 37f28503aa9afc51903b226c1cbd3c05031e4a0a Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:10:46 +0400 Subject: [PATCH 11/34] Support standalone modal controllers --- .../Navigation/NavigationContainer.swift | 6 +- .../Navigation/NavigationController.swift | 17 ++++- .../Display/Navigation/NavigationLayout.swift | 16 ++++- .../Navigation/NavigationModalContainer.swift | 69 ++++++++++++++----- .../Display/Display/ViewController.swift | 7 +- 5 files changed, 92 insertions(+), 23 deletions(-) diff --git a/submodules/Display/Display/Navigation/NavigationContainer.swift b/submodules/Display/Display/Navigation/NavigationContainer.swift index adfeb6129c..27bfe4c22d 100644 --- a/submodules/Display/Display/Navigation/NavigationContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationContainer.swift @@ -371,7 +371,11 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate { } switch transitionType { case .push: - strongSelf.syncKeyboard(leftEdge: topFrame.minX - bottomFrame.width, transition: transition) + if let _ = strongSelf.state.transition, let top = strongSelf.state.top, viewTreeContainsFirstResponder(view: top.value.view) { + strongSelf.syncKeyboard(leftEdge: topFrame.minX, transition: transition) + } else { + strongSelf.syncKeyboard(leftEdge: topFrame.minX - bottomFrame.width, transition: transition) + } case .pop: strongSelf.syncKeyboard(leftEdge: topFrame.minX, transition: transition) } diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift index 04a77b3b4e..24890663da 100644 --- a/submodules/Display/Display/Navigation/NavigationController.swift +++ b/submodules/Display/Display/Navigation/NavigationController.swift @@ -537,6 +537,11 @@ open class NavigationController: UINavigationController, ContainableController, for i in (0 ..< navigationLayout.modal.count).reversed() { let modalContainer = self.modalContainers[i] + var isStandaloneModal = false + if case .standaloneModal = modalContainer.container.controllers.first?.navigationPresentation { + isStandaloneModal = true + } + let containerTransition: ContainedViewLayoutTransition if modalContainer.supernode == nil { containerTransition = .immediate @@ -572,7 +577,9 @@ open class NavigationController: UINavigationController, ContainableController, } if modalContainer.supernode != nil { - visibleModalCount += 1 + if !isStandaloneModal || visibleModalCount != 0 { + visibleModalCount += 1 + } if previousModalContainer == nil { topModalDismissProgress = modalContainer.dismissProgress if case .compact = layout.metrics.widthClass { @@ -587,6 +594,14 @@ open class NavigationController: UINavigationController, ContainableController, modalContainer.canHaveKeyboardFocus = false } previousModalContainer = modalContainer + if isStandaloneModal { + switch modalContainer.container.statusBarStyle { + case .Hide: + statusBarHidden = true + default: + break + } + } } } diff --git a/submodules/Display/Display/Navigation/NavigationLayout.swift b/submodules/Display/Display/Navigation/NavigationLayout.swift index c7f93613cf..1b3e4f82a4 100644 --- a/submodules/Display/Display/Navigation/NavigationLayout.swift +++ b/submodules/Display/Display/Navigation/NavigationLayout.swift @@ -10,6 +10,7 @@ enum RootNavigationLayout { struct ModalContainerLayout { var controllers: [ViewController] + var isStandalone: Bool } struct NavigationLayout { @@ -23,6 +24,7 @@ func makeNavigationLayout(mode: NavigationControllerMode, layout: ContainerViewL for controller in controllers { let requiresModal: Bool var beginsModal: Bool = false + var isStandalone: Bool = false switch controller.navigationPresentation { case .default: requiresModal = false @@ -31,6 +33,10 @@ func makeNavigationLayout(mode: NavigationControllerMode, layout: ContainerViewL case .modal: requiresModal = true beginsModal = true + case .standaloneModal: + requiresModal = true + beginsModal = true + isStandalone = true case .modalInLargeLayout: switch layout.metrics.widthClass { case .compact: @@ -40,13 +46,17 @@ func makeNavigationLayout(mode: NavigationControllerMode, layout: ContainerViewL } } if requiresModal { - if beginsModal || modalStack.isEmpty { - modalStack.append(ModalContainerLayout(controllers: [controller])) + if beginsModal || modalStack.isEmpty || modalStack[modalStack.count - 1].isStandalone { + modalStack.append(ModalContainerLayout(controllers: [controller], isStandalone: isStandalone)) } else { modalStack[modalStack.count - 1].controllers.append(controller) } } else if !modalStack.isEmpty { - modalStack[modalStack.count - 1].controllers.append(controller) + if modalStack[modalStack.count - 1].isStandalone { + modalStack.append(ModalContainerLayout(controllers: [controller], isStandalone: isStandalone)) + } else { + modalStack[modalStack.count - 1].controllers.append(controller) + } } else { rootControllers.append(controller) } diff --git a/submodules/Display/Display/Navigation/NavigationModalContainer.swift b/submodules/Display/Display/Navigation/NavigationModalContainer.swift index 835cb2293f..1b4d433e8e 100644 --- a/submodules/Display/Display/Navigation/NavigationModalContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationModalContainer.swift @@ -289,6 +289,11 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes self.validLayout = layout + var isStandaloneModal = false + if case .standaloneModal = controllers.first?.navigationPresentation { + isStandaloneModal = true + } + transition.updateFrame(node: self.dim, frame: CGRect(origin: CGPoint(), size: layout.size)) self.ignoreScrolling = true self.scrollNode.view.isScrollEnabled = (layout.inputHeight == nil || layout.inputHeight == 0.0) && self.isInteractiveDimissEnabled @@ -302,6 +307,8 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes } self.ignoreScrolling = false + self.scrollNode.view.isScrollEnabled = !isStandaloneModal + let containerLayout: ContainerViewLayout let containerFrame: CGRect let containerScale: CGFloat @@ -310,14 +317,28 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes self.panRecognizer?.isEnabled = true self.dim.backgroundColor = UIColor(white: 0.0, alpha: 0.25) self.container.clipsToBounds = true - self.container.cornerRadius = 10.0 - if #available(iOS 11.0, *) { - self.container.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner] + if isStandaloneModal { + self.container.cornerRadius = 0.0 + } else { + self.container.cornerRadius = 10.0 } - var topInset: CGFloat = 10.0 - if let statusBarHeight = layout.statusBarHeight { - topInset += statusBarHeight + if #available(iOS 11.0, *) { + if layout.safeInsets.bottom.isZero { + self.container.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner] + } else { + self.container.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner] + } + } + + var topInset: CGFloat + if isStandaloneModal { + topInset = 0.0 + } else { + topInset = 10.0 + if let statusBarHeight = layout.statusBarHeight { + topInset += statusBarHeight + } } containerLayout = ContainerViewLayout(size: CGSize(width: layout.size.width, height: layout.size.height - topInset), metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: layout.intrinsicInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.intrinsicInsets.right), safeInsets: UIEdgeInsets(top: 0.0, left: layout.safeInsets.left, bottom: layout.safeInsets.bottom, right: layout.safeInsets.right), statusBarHeight: nil, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) @@ -358,8 +379,11 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes } func animateIn(transition: ContainedViewLayoutTransition) { - transition.updateAlpha(node: self.dim, alpha: 1.0) - transition.animatePositionAdditive(node: self.container, offset: CGPoint(x: 0.0, y: self.bounds.height + self.container.bounds.height / 2.0 - (self.container.position.y - self.bounds.height))) + if case .standaloneModal = self.container.controllers.first?.navigationPresentation { + } else { + transition.updateAlpha(node: self.dim, alpha: 1.0) + transition.animatePositionAdditive(node: self.container, offset: CGPoint(x: 0.0, y: self.bounds.height + self.container.bounds.height / 2.0 - (self.container.position.y - self.bounds.height))) + } } func dismiss(transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) -> ContainedViewLayoutTransition { @@ -367,15 +391,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes controller.viewWillDisappear(transition.isAnimated) } - if transition.isAnimated { - let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) - let positionTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) - alphaTransition.updateAlpha(node: self.dim, alpha: 0.0, beginWithCurrentState: true) - positionTransition.updatePosition(node: self.container, position: CGPoint(x: self.container.position.x, y: self.bounds.height + self.container.bounds.height / 2.0 + self.bounds.height), beginWithCurrentState: true, completion: { [weak self] _ in - completion() - }) - return positionTransition - } else { + if case .standaloneModal = self.container.controllers.first?.navigationPresentation { for controller in self.container.controllers { controller.setIgnoreAppearanceMethodInvocations(true) controller.displayNode.removeFromSupernode() @@ -384,6 +400,25 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes } completion() return transition + } else { + if transition.isAnimated { + let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) + let positionTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) + alphaTransition.updateAlpha(node: self.dim, alpha: 0.0, beginWithCurrentState: true) + positionTransition.updatePosition(node: self.container, position: CGPoint(x: self.container.position.x, y: self.bounds.height + self.container.bounds.height / 2.0 + self.bounds.height), beginWithCurrentState: true, completion: { [weak self] _ in + completion() + }) + return positionTransition + } else { + for controller in self.container.controllers { + controller.setIgnoreAppearanceMethodInvocations(true) + controller.displayNode.removeFromSupernode() + controller.setIgnoreAppearanceMethodInvocations(false) + controller.viewDidDisappear(transition.isAnimated) + } + completion() + return transition + } } } diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Display/ViewController.swift index f2774dbd40..eca21c7897 100644 --- a/submodules/Display/Display/ViewController.swift +++ b/submodules/Display/Display/ViewController.swift @@ -62,6 +62,7 @@ public enum ViewControllerNavigationPresentation { case `default` case master case modal + case standaloneModal case modalInLargeLayout } @@ -439,7 +440,11 @@ public enum ViewControllerNavigationPresentation { override open func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) { if let navigationController = self.navigationController as? NavigationController { - navigationController.filterController(self, animated: flag) + var animated = flag + if case .standaloneModal = self.navigationPresentation { + animated = false + } + navigationController.filterController(self, animated: animated) } else { assertionFailure() } From 6f4aa38ab81da28ae6fd65a2c86438395482d848 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:12:25 +0400 Subject: [PATCH 12/34] Refactor searchPeerMembers, use it for legacy suggestions --- submodules/LegacyMediaPickerUI/BUCK | 1 + .../Sources/LegacyAttachmentMenu.swift | 26 +++++++------- .../Sources/LegacyMediaPickers.swift | 6 ++-- .../Sources/LegacySuggestionContext.swift | 36 +++++++------------ submodules/SearchPeerMembers/BUCK | 17 +++++++++ .../Sources}/SearchPeerMembers.swift | 6 ++-- .../ChatInterfaceStateContextQueries.swift | 1 + .../TelegramUI/TelegramUI/LegacyCamera.swift | 4 +-- 8 files changed, 52 insertions(+), 45 deletions(-) create mode 100644 submodules/SearchPeerMembers/BUCK rename submodules/{TelegramUI/TelegramUI => SearchPeerMembers/Sources}/SearchPeerMembers.swift (92%) diff --git a/submodules/LegacyMediaPickerUI/BUCK b/submodules/LegacyMediaPickerUI/BUCK index 65c4d92fec..5aafa18eed 100644 --- a/submodules/LegacyMediaPickerUI/BUCK +++ b/submodules/LegacyMediaPickerUI/BUCK @@ -24,6 +24,7 @@ static_library( "//submodules/LegacyUI:LegacyUI", "//submodules/MimeTypes:MimeTypes", "//submodules/LocalMediaResources:LocalMediaResources", + "//submodules/SearchPeerMembers:SearchPeerMembers", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift index b06d06f4c6..f6544e8573 100644 --- a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift +++ b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift @@ -20,7 +20,7 @@ public struct LegacyAttachmentMenuMediaEditing: OptionSet { public static let imageOrVideo = LegacyAttachmentMenuMediaEditing(rawValue: 1 << 0) } -public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaOptions: LegacyAttachmentMenuMediaEditing?, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, canSendPolls: Bool, theme: PresentationTheme, strings: PresentationStrings, parentController: LegacyController, recentlyUsedInlineBots: [Peer], initialCaption: String, openGallery: @escaping () -> Void, openCamera: @escaping (TGAttachmentCameraView?, TGMenuSheetController?) -> Void, openFileGallery: @escaping () -> Void, openWebSearch: @escaping () -> Void, openMap: @escaping () -> Void, openContacts: @escaping () -> Void, openPoll: @escaping () -> Void, presentSelectionLimitExceeded: @escaping () -> Void, presentCantSendMultipleFiles: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, selectRecentlyUsedInlineBot: @escaping (Peer) -> Void) -> TGMenuSheetController { +public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaOptions: LegacyAttachmentMenuMediaEditing?, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, canSendPolls: Bool, presentationData: PresentationData, parentController: LegacyController, recentlyUsedInlineBots: [Peer], initialCaption: String, openGallery: @escaping () -> Void, openCamera: @escaping (TGAttachmentCameraView?, TGMenuSheetController?) -> Void, openFileGallery: @escaping () -> Void, openWebSearch: @escaping () -> Void, openMap: @escaping () -> Void, openContacts: @escaping () -> Void, openPoll: @escaping () -> Void, presentSelectionLimitExceeded: @escaping () -> Void, presentCantSendMultipleFiles: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, selectRecentlyUsedInlineBot: @escaping (Peer) -> Void) -> TGMenuSheetController { let isSecretChat = peer.id.namespace == Namespaces.Peer.SecretChat let controller = TGMenuSheetController(context: parentController.context, dark: false)! @@ -56,8 +56,8 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO if canSendImageOrVideo { let carouselItem = TGAttachmentCarouselItemView(context: parentController.context, camera: PGCamera.cameraAvailable(), selfPortrait: false, forProfilePhoto: false, assetType: TGMediaAssetAnyType, saveEditedPhotos: !isSecretChat && saveEditedPhotos, allowGrouping: editMediaOptions == nil && allowGrouping, allowSelection: editMediaOptions == nil, allowEditing: true, document: false, selectionLimit: selectionLimit)! carouselItemView = carouselItem - carouselItem.suggestionContext = legacySuggestionContext(account: context.account, peerId: peer.id) - carouselItem.recipientName = peer.displayTitle + carouselItem.suggestionContext = legacySuggestionContext(context: context, peerId: peer.id) + carouselItem.recipientName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) carouselItem.cameraPressed = { [weak controller] cameraView in if let controller = controller { DeviceAccess.authorizeAccess(to: .camera, presentationData: context.sharedContext.currentPresentationData.with { $0 }, present: context.sharedContext.presentGlobalController, openSettings: context.sharedContext.applicationBindings.openSettings, { value in @@ -98,7 +98,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO carouselItem.editingContext.setInitialCaption(initialCaption, entities: []) itemViews.append(carouselItem) - let galleryItem = TGMenuSheetButtonItemView(title: editing ? strings.Conversation_EditingMessageMediaChange : strings.AttachmentMenu_PhotoOrVideo, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let galleryItem = TGMenuSheetButtonItemView(title: editing ? presentationData.strings.Conversation_EditingMessageMediaChange : presentationData.strings.AttachmentMenu_PhotoOrVideo, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in controller?.dismiss(animated: true) openGallery() })! @@ -116,7 +116,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if !editing { - let fileItem = TGMenuSheetButtonItemView(title: strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in + let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in controller?.dismiss(animated: true) openFileGallery() })! @@ -125,7 +125,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if canEditCurrent { - let fileItem = TGMenuSheetButtonItemView(title: strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in + let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in controller?.dismiss(animated: true) openFileGallery() })! @@ -133,21 +133,21 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if editMediaOptions == nil { - let locationItem = TGMenuSheetButtonItemView(title: strings.Conversation_Location, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let locationItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Location, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in controller?.dismiss(animated: true) openMap() })! itemViews.append(locationItem) if (peer is TelegramGroup || peer is TelegramChannel) && canSendMessagesToPeer(peer) && canSendPolls { - let pollItem = TGMenuSheetButtonItemView(title: strings.AttachmentMenu_Poll, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let pollItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_Poll, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in controller?.dismiss(animated: true) openPoll() })! itemViews.append(pollItem) } - let contactItem = TGMenuSheetButtonItemView(title: strings.Conversation_Contact, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let contactItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Contact, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in controller?.dismiss(animated: true) openContacts() })! @@ -174,7 +174,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO carouselItemView?.remainingHeight = TGMenuSheetButtonItemViewHeight * CGFloat(itemViews.count - 1) - let cancelItem = TGMenuSheetButtonItemView(title: strings.Common_Cancel, type: TGMenuSheetButtonTypeCancel, action: { [weak controller] in + let cancelItem = TGMenuSheetButtonItemView(title: presentationData.strings.Common_Cancel, type: TGMenuSheetButtonTypeCancel, action: { [weak controller] in controller?.dismiss(animated: true) })! itemViews.append(cancelItem) @@ -189,8 +189,8 @@ public func legacyMenuPaletteFromTheme(_ theme: PresentationTheme) -> TGMenuShee return TGMenuSheetPallete(dark: theme.overallDarkAppearance, backgroundColor: sheetTheme.opaqueItemBackgroundColor, selectionColor: sheetTheme.opaqueItemHighlightedBackgroundColor, separatorColor: sheetTheme.opaqueItemSeparatorColor, accentColor: sheetTheme.controlAccentColor, destructiveColor: sheetTheme.destructiveActionTextColor, textColor: sheetTheme.primaryTextColor, secondaryTextColor: sheetTheme.secondaryTextColor, spinnerColor: sheetTheme.secondaryTextColor, badgeTextColor: sheetTheme.controlAccentColor, badgeImage: nil, cornersImage: generateStretchableFilledCircleImage(diameter: 11.0, color: nil, strokeColor: nil, strokeWidth: nil, backgroundColor: sheetTheme.opaqueItemBackgroundColor)) } -public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, saveEditedPhotos: Bool, allowGrouping: Bool, theme: PresentationTheme, strings: PresentationStrings, images: [UIImage], sendMessagesWithSignals: @escaping ([Any]?) -> Void, present: (ViewController, Any?) -> Void, initialLayout: ContainerViewLayout? = nil) -> ViewController { - let legacyController = LegacyController(presentation: .custom, theme: theme, initialLayout: initialLayout) +public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, saveEditedPhotos: Bool, allowGrouping: Bool, presentationData: PresentationData, images: [UIImage], sendMessagesWithSignals: @escaping ([Any]?) -> Void, present: (ViewController, Any?) -> Void, initialLayout: ContainerViewLayout? = nil) -> ViewController { + let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme, initialLayout: initialLayout) legacyController.statusBar.statusBarStyle = .Ignore legacyController.controllerLoaded = { [weak legacyController] in legacyController?.view.disablesInteractiveTransitionGestureRecognizer = true @@ -209,7 +209,7 @@ public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, saveEdit } hasSilentPosting = true } - let recipientName = peer.displayTitle + let recipientName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) legacyController.enableSizeClassSignal = true diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift index bc25052bac..32cf4d35d2 100644 --- a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift +++ b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift @@ -22,7 +22,7 @@ public func configureLegacyAssetPicker(_ controller: TGMediaAssetsController, co controller.captionsEnabled = captionsEnabled controller.inhibitDocumentCaptions = false - controller.suggestionContext = legacySuggestionContext(account: context.account, peerId: peer.id) + controller.suggestionContext = legacySuggestionContext(context: context, peerId: peer.id) if peer.id != context.account.peerId { if peer is TelegramUser { controller.hasTimer = hasSchedule @@ -67,7 +67,7 @@ public func legacyAssetPicker(context: AccountContext, presentationData: Present } else { Queue.mainQueue().async { subscriber.putNext({ context in - let controller = TGMediaAssetsController(context: context, assetGroup: group, intent: intent, recipientName: peer?.displayTitle, saveEditedPhotos: !isSecretChat && saveEditedPhotos, allowGrouping: allowGrouping, inhibitSelection: editingMedia, selectionLimit: Int32(selectionLimit)) + let controller = TGMediaAssetsController(context: context, assetGroup: group, intent: intent, recipientName: peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), saveEditedPhotos: !isSecretChat && saveEditedPhotos, allowGrouping: allowGrouping, inhibitSelection: editingMedia, selectionLimit: Int32(selectionLimit)) return controller! }) subscriber.putCompletion() @@ -76,7 +76,7 @@ public func legacyAssetPicker(context: AccountContext, presentationData: Present }) } else { subscriber.putNext({ context in - let controller = TGMediaAssetsController(context: context, assetGroup: nil, intent: intent, recipientName: peer?.displayTitle, saveEditedPhotos: !isSecretChat && saveEditedPhotos, allowGrouping: allowGrouping, selectionLimit: Int32(selectionLimit)) + let controller = TGMediaAssetsController(context: context, assetGroup: nil, intent: intent, recipientName: peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), saveEditedPhotos: !isSecretChat && saveEditedPhotos, allowGrouping: allowGrouping, selectionLimit: Int32(selectionLimit)) return controller! }) subscriber.putCompletion() diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift b/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift index 6adb0fe441..097d7682b1 100644 --- a/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift +++ b/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift @@ -5,30 +5,18 @@ import Postbox import SwiftSignalKit import LegacyComponents import LegacyUI +import SearchPeerMembers +import AccountContext -public func legacySuggestionContext(account: Account, peerId: PeerId) -> TGSuggestionContext { - let context = TGSuggestionContext() - context.userListSignal = { query in +public func legacySuggestionContext(context: AccountContext, peerId: PeerId) -> TGSuggestionContext { + let suggestionContext = TGSuggestionContext() + suggestionContext.userListSignal = { query in return SSignal { subscriber in if let query = query { let normalizedQuery = query.lowercased() - let disposable = peerParticipants(postbox: account.postbox, id: peerId).start(next: { peers in - let filteredPeers = peers.filter { peer in - if peer.indexName.matchesByTokens(normalizedQuery) { - return true - } - if let addressName = peer.addressName, addressName.lowercased().hasPrefix(normalizedQuery) { - return true - } - return false - } - let sortedPeers = filteredPeers.sorted(by: { lhs, rhs in - let result = lhs.indexName.indexName(.lastNameFirst).compare(rhs.indexName.indexName(.lastNameFirst)) - return result == .orderedAscending - }) - + let disposable = searchPeerMembers(context: context, peerId: peerId, query: query).start(next: { peers in let users = NSMutableArray() - for peer in sortedPeers { + for peer in peers { let user = TGUser() if let peer = peer as? TelegramUser { user.uid = peer.id.id @@ -56,9 +44,9 @@ public func legacySuggestionContext(account: Account, peerId: PeerId) -> TGSugge } } } - context.hashtagListSignal = { query in + suggestionContext.hashtagListSignal = { query in return SSignal { subscriber in - let disposable = (recentlyUsedHashtags(postbox: account.postbox) |> map { hashtags -> [String] in + let disposable = (recentlyUsedHashtags(postbox: context.account.postbox) |> map { hashtags -> [String] in let normalizedQuery = query?.lowercased() var result: [String] = [] if let normalizedQuery = normalizedQuery { @@ -81,12 +69,12 @@ public func legacySuggestionContext(account: Account, peerId: PeerId) -> TGSugge } } } - context.alphacodeSignal = { query, inputLanguageCode in + suggestionContext.alphacodeSignal = { query, inputLanguageCode in guard let query = query, let inputLanguageCode = inputLanguageCode else { return SSignal.complete() } return SSignal { subscriber in - let disposable = (searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: inputLanguageCode, query: query, completeMatch: query.count < 3) + let disposable = (searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: inputLanguageCode, query: query, completeMatch: query.count < 3) |> map { keywords -> [TGAlphacodeEntry] in var result: [TGAlphacodeEntry] = [] for keyword in keywords { @@ -107,5 +95,5 @@ public func legacySuggestionContext(account: Account, peerId: PeerId) -> TGSugge } } } - return context + return suggestionContext } diff --git a/submodules/SearchPeerMembers/BUCK b/submodules/SearchPeerMembers/BUCK new file mode 100644 index 0000000000..512cdc93c6 --- /dev/null +++ b/submodules/SearchPeerMembers/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "SearchPeerMembers", + srcs = glob([ + "Sources/**/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/AccountContext:AccountContext", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramUI/TelegramUI/SearchPeerMembers.swift b/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift similarity index 92% rename from submodules/TelegramUI/TelegramUI/SearchPeerMembers.swift rename to submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift index 6e18243678..b7284f6c45 100644 --- a/submodules/TelegramUI/TelegramUI/SearchPeerMembers.swift +++ b/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift @@ -4,7 +4,7 @@ import TelegramCore import SwiftSignalKit import AccountContext -func searchPeerMembers(context: AccountContext, peerId: PeerId, query: String) -> Signal<[Peer], NoError> { +public func searchPeerMembers(context: AccountContext, peerId: PeerId, query: String) -> Signal<[Peer], NoError> { if peerId.namespace == Namespaces.Peer.CloudChannel { return context.account.postbox.transaction { transaction -> CachedChannelData? in return transaction.getPeerCachedData(peerId: peerId) as? CachedChannelData @@ -16,7 +16,7 @@ func searchPeerMembers(context: AccountContext, peerId: PeerId, query: String) - if case .ready = state.loadingState { let normalizedQuery = query.lowercased() subscriber.putNext(state.list.compactMap { participant -> Peer? in - if participant.peer.displayTitle.isEmpty { + if participant.peer.isDeleted { return nil } if normalizedQuery.isEmpty { @@ -49,7 +49,7 @@ func searchPeerMembers(context: AccountContext, peerId: PeerId, query: String) - let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query.isEmpty ? nil : query, updated: { state in if case .ready = state.loadingState { subscriber.putNext(state.list.compactMap { participant in - if participant.peer.displayTitle.isEmpty { + if participant.peer.isDeleted { return nil } return participant.peer diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift index 6602662c2a..b1e2ba79d1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift @@ -8,6 +8,7 @@ import LegacyComponents import TextFormat import AccountContext import Emoji +import SearchPeerMembers enum ChatContextQueryError { case inlineBotLocationRequest(PeerId) diff --git a/submodules/TelegramUI/TelegramUI/LegacyCamera.swift b/submodules/TelegramUI/TelegramUI/LegacyCamera.swift index 4cc3af7dc4..855c868b68 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyCamera.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyCamera.swift @@ -57,8 +57,8 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, cameraView: TGAt controller.allowCaptionEntities = true controller.allowGrouping = mediaGrouping controller.inhibitDocumentCaptions = false - controller.suggestionContext = legacySuggestionContext(account: context.account, peerId: peer.id) - controller.recipientName = peer.displayTitle + controller.suggestionContext = legacySuggestionContext(context: context, peerId: peer.id) + controller.recipientName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) if peer.id != context.account.peerId { if peer is TelegramUser { controller.hasTimer = hasSchedule From ac6f0dc20ed8668e4c4dcbf080152aadb7da243f Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:12:49 +0400 Subject: [PATCH 13/34] Fix push transition --- .../Display/Display/NavigationTransitionCoordinator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Display/Display/NavigationTransitionCoordinator.swift b/submodules/Display/Display/NavigationTransitionCoordinator.swift index ebf0e87ec1..a3ea0997c5 100644 --- a/submodules/Display/Display/NavigationTransitionCoordinator.swift +++ b/submodules/Display/Display/NavigationTransitionCoordinator.swift @@ -70,7 +70,7 @@ class NavigationTransitionCoordinator { switch transition { case .Push: - self.container.insertSubnode(topNode, belowSubnode: topNode) + self.container.addSubnode(topNode) case .Pop: self.container.insertSubnode(bottomNode, belowSubnode: topNode) } From 55d2d88757784d8597b04e2615df50e79f8fdf2e Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:13:05 +0400 Subject: [PATCH 14/34] Support modal preview in Groups in Common --- .../Sources/GroupsInCommonController.swift | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift index 48a5213c07..987291d8c7 100644 --- a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift +++ b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift @@ -10,15 +10,18 @@ import ItemListUI import PresentationDataUtils import AccountContext import ItemListPeerItem +import ContextUI private final class GroupsInCommonControllerArguments { let account: Account let openPeer: (PeerId) -> Void + let contextAction: (Peer, ASDisplayNode, ContextGesture?) -> Void - init(account: Account, openPeer: @escaping (PeerId) -> Void) { + init(account: Account, openPeer: @escaping (PeerId) -> Void, contextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void) { self.account = account self.openPeer = openPeer + self.contextAction = contextAction } } @@ -94,6 +97,8 @@ private enum GroupsInCommonEntry: ItemListNodeEntry { arguments.openPeer(peer.id) }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in + }, contextAction: { node, gesture in + arguments.contextAction(peer, node, gesture) }) } } @@ -133,11 +138,15 @@ public func groupsInCommonController(context: AccountContext, peerId: PeerId) -> var pushControllerImpl: ((ViewController) -> Void)? var getNavigationControllerImpl: (() -> NavigationController?)? + var contextActionImpl: ((Peer, ASDisplayNode, ContextGesture?) -> Void)? + let arguments = GroupsInCommonControllerArguments(account: context.account, openPeer: { memberId in guard let navigationController = getNavigationControllerImpl?() else { return } context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(memberId), animated: true)) + }, contextAction: { peer, node, gesture in + contextActionImpl?(peer, node, gesture) }) let peersSignal: Signal<[Peer]?, NoError> = .single(nil) |> then(groupsInCommon(account: context.account, peerId: peerId) |> mapToSignal { peerIds -> Signal<[Peer], NoError> in @@ -185,5 +194,42 @@ public func groupsInCommonController(context: AccountContext, peerId: PeerId) -> getNavigationControllerImpl = { [weak controller] in return controller?.navigationController as? NavigationController } + contextActionImpl = { [weak controller] peer, node, gesture in + guard let controller = controller else { + return + } + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let chatController = context.sharedContext.makeChatController(context: context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) + chatController.canReadHistory.set(false) + let items: [ContextMenuItem] = [ + .action(ContextMenuActionItem(text: presentationData.strings.Conversation_LinkDialogOpen, icon: { _ in nil }, action: { _, f in + f(.dismissWithoutContent) + arguments.openPeer(peer.id) + })) + ] + let contextController = ContextController(account: context.account, theme: presentationData.theme, strings: presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + controller.presentInGlobalOverlay(contextController) + } return controller } + +private final class ContextControllerContentSourceImpl: ContextControllerContentSource { + let controller: ViewController + weak var sourceNode: ASDisplayNode? + + init(controller: ViewController, sourceNode: ASDisplayNode?) { + self.controller = controller + self.sourceNode = sourceNode + } + + func transitionInfo() -> ContextControllerTakeControllerInfo? { + let sourceNode = self.sourceNode + return ContextControllerTakeControllerInfo(contentAreaInScreenSpace: CGRect(origin: CGPoint(), size: CGSize(width: 10.0, height: 10.0)), sourceNode: { [weak sourceNode] in + if let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds) + } else { + return nil + } + }) + } +} From 5d52f7866d30a103e0f789d1e1e7fd5e783f5e97 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:13:50 +0400 Subject: [PATCH 15/34] Don't use cached state for channels that are not in the chat list --- submodules/Postbox/Postbox/Postbox.swift | 50 +++++++++--------- .../TelegramCore/AccountViewTracker.swift | 51 +++++++++++++------ 2 files changed, 62 insertions(+), 39 deletions(-) diff --git a/submodules/Postbox/Postbox/Postbox.swift b/submodules/Postbox/Postbox/Postbox.swift index a66c96ef40..ba0929d54f 100644 --- a/submodules/Postbox/Postbox/Postbox.swift +++ b/submodules/Postbox/Postbox/Postbox.swift @@ -2225,7 +2225,8 @@ public final class Postbox { var anchor: HistoryViewInputAnchor = .upperBound switch peerIds { - case let .single(peerId): + case let .single(peerId): + if self.chatListTable.getPeerChatListIndex(peerId: peerId) != nil { if let combinedState = self.readStateTable.getCombinedState(peerId), let state = combinedState.states.first, state.1.count != 0 { switch state.1 { case let .idBased(maxIncomingReadId, _, _, _, _): @@ -2236,32 +2237,33 @@ public final class Postbox { } else if let scrollIndex = self.peerChatInterfaceStateTable.get(peerId)?.historyScrollMessageIndex { anchor = .index(scrollIndex) } - case let .associated(mainId, associatedId): - var ids: [PeerId] = [] - ids.append(mainId) - if let associatedId = associatedId { - ids.append(associatedId.peerId) - } - - var found = false - loop: for peerId in ids.reversed() { - if let combinedState = self.readStateTable.getCombinedState(peerId), let state = combinedState.states.first, state.1.count != 0 { - found = true - switch state.1 { - case let .idBased(maxIncomingReadId, _, _, _, _): - anchor = .message(MessageId(peerId: peerId, namespace: state.0, id: maxIncomingReadId)) - case let .indexBased(maxIncomingReadIndex, _, _, _): - anchor = .index(maxIncomingReadIndex) - } - break loop - } - } + } + case let .associated(mainId, associatedId): + var ids: [PeerId] = [] + ids.append(mainId) + if let associatedId = associatedId { + ids.append(associatedId.peerId) + } - if !found { - if let scrollIndex = self.peerChatInterfaceStateTable.get(mainId)?.historyScrollMessageIndex { - anchor = .index(scrollIndex) + var found = false + loop: for peerId in ids.reversed() { + if self.chatListTable.getPeerChatListIndex(peerId: mainId) != nil, let combinedState = self.readStateTable.getCombinedState(peerId), let state = combinedState.states.first, state.1.count != 0 { + found = true + switch state.1 { + case let .idBased(maxIncomingReadId, _, _, _, _): + anchor = .message(MessageId(peerId: peerId, namespace: state.0, id: maxIncomingReadId)) + case let .indexBased(maxIncomingReadIndex, _, _, _): + anchor = .index(maxIncomingReadIndex) } + break loop } + } + + if !found { + if let scrollIndex = self.peerChatInterfaceStateTable.get(mainId)?.historyScrollMessageIndex { + anchor = .index(scrollIndex) + } + } } return self.syncAroundMessageHistoryViewForPeerId(subscriber: subscriber, peerIds: peerIds, count: count, anchor: anchor, fixedCombinedReadStates: nil, topTaggedMessageIdNamespaces: topTaggedMessageIdNamespaces, tagMask: tagMask, namespaces: namespaces, orderStatistics: orderStatistics, additionalData: additionalData) }) diff --git a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift index 81f1949c73..62f6928005 100644 --- a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift +++ b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift @@ -865,7 +865,7 @@ public final class AccountViewTracker { } } - func wrappedMessageHistorySignal(chatLocation: ChatLocation, signal: Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError>) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { + func wrappedMessageHistorySignal(chatLocation: ChatLocation, signal: Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError>, addHoleIfNeeded: Bool) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { let history = withState(signal, { [weak self] () -> Int32 in if let strongSelf = self { return OSAtomicIncrement32(&strongSelf.nextViewId) @@ -901,18 +901,39 @@ public final class AccountViewTracker { if case let .peer(peerId) = chatLocation, peerId.namespace == Namespaces.Peer.CloudChannel { return Signal { subscriber in - let disposable = history.start(next: { next in - subscriber.putNext(next) - }, error: { error in - subscriber.putError(error) - }, completed: { - subscriber.putCompletion() - }) - let polled = self.polledChannel(peerId: peerId).start() - return ActionDisposable { - disposable.dispose() - polled.dispose() + let combinedDisposable = MetaDisposable() + self.queue.async { + var addHole = false + if let context = self.channelPollingContexts[peerId] { + if context.subscribers.isEmpty { + addHole = true + } + } else { + addHole = true + } + if addHole { + let _ = self.account?.postbox.transaction({ transaction -> Void in + if transaction.getPeerChatListIndex(peerId) == nil { + if let message = transaction.getTopPeerMessageId(peerId: peerId, namespace: Namespaces.Message.Cloud) { + transaction.addHole(peerId: peerId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: message.id + 1 ... (Int32.max - 1)) + } + } + }).start() + } + let disposable = history.start(next: { next in + subscriber.putNext(next) + }, error: { error in + subscriber.putError(error) + }, completed: { + subscriber.putCompletion() + }) + let polled = self.polledChannel(peerId: peerId).start() + combinedDisposable.set(ActionDisposable { + disposable.dispose() + polled.dispose() + }) } + return combinedDisposable } } else { return history @@ -952,7 +973,7 @@ public final class AccountViewTracker { public func aroundMessageOfInterestHistoryViewForLocation(_ chatLocation: ChatLocation, count: Int, tagMask: MessageTags? = nil, orderStatistics: MessageHistoryViewOrderStatistics = [], additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { if let account = self.account { let signal = account.postbox.aroundMessageOfInterestHistoryViewForChatLocation(chatLocation, count: count, topTaggedMessageIdNamespaces: [Namespaces.Message.Cloud], tagMask: tagMask, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: orderStatistics, additionalData: wrappedHistoryViewAdditionalData(chatLocation: chatLocation, additionalData: additionalData)) - return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal) + return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal, addHoleIfNeeded: true) } else { return .never() } @@ -961,7 +982,7 @@ public final class AccountViewTracker { public func aroundIdMessageHistoryViewForLocation(_ chatLocation: ChatLocation, count: Int, messageId: MessageId, tagMask: MessageTags? = nil, orderStatistics: MessageHistoryViewOrderStatistics = [], additionalData: [AdditionalMessageHistoryViewData] = []) -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { if let account = self.account { let signal = account.postbox.aroundIdMessageHistoryViewForLocation(chatLocation, count: count, messageId: messageId, topTaggedMessageIdNamespaces: [Namespaces.Message.Cloud], tagMask: tagMask, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: orderStatistics, additionalData: wrappedHistoryViewAdditionalData(chatLocation: chatLocation, additionalData: additionalData)) - return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal) + return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal, addHoleIfNeeded: false) } else { return .never() } @@ -979,7 +1000,7 @@ public final class AccountViewTracker { inputAnchor = .index(index) } let signal = account.postbox.aroundMessageHistoryViewForLocation(chatLocation, anchor: inputAnchor, count: count, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: [Namespaces.Message.Cloud], tagMask: tagMask, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: orderStatistics, additionalData: wrappedHistoryViewAdditionalData(chatLocation: chatLocation, additionalData: additionalData)) - return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal) + return wrappedMessageHistorySignal(chatLocation: chatLocation, signal: signal, addHoleIfNeeded: false) } else { return .never() } From caff7a375d17320bb881e584fddc9b04efd22c8f Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:14:37 +0400 Subject: [PATCH 16/34] Fix moduless --- submodules/Display/BUCK | 1 + submodules/TelegramUI/BUCK | 1 + 2 files changed, 2 insertions(+) diff --git a/submodules/Display/BUCK b/submodules/Display/BUCK index bdb1a1dbb6..77ebb925a3 100644 --- a/submodules/Display/BUCK +++ b/submodules/Display/BUCK @@ -16,6 +16,7 @@ framework( "//submodules/AsyncDisplayKit:AsyncDisplayKit#dynamic", "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", "//submodules/AppBundle:AppBundle", + "//submodules/Markdown:Markdown", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK index 80ec5806b9..76e8891f18 100644 --- a/submodules/TelegramUI/BUCK +++ b/submodules/TelegramUI/BUCK @@ -188,6 +188,7 @@ framework( "//submodules/WalletUI:WalletUI", "//submodules/WalletCore:WalletCore", "//submodules/Markdown:Markdown", + "//submodules/SearchPeerMembers:SearchPeerMembers", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", From bd02a7e88a9cf023110f126b8b6ce06ab2cb95a4 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:15:33 +0400 Subject: [PATCH 17/34] Fail simultaneous taps --- .../TapLongTapOrDoubleTapGestureRecognizer.swift | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift b/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift index add9373781..62107686ed 100644 --- a/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift +++ b/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift @@ -21,6 +21,19 @@ private func cancelScrollViewGestures(view: UIView?) { } } +private func cancelOtherGestures(gesture: TapLongTapOrDoubleTapGestureRecognizer, view: UIView) { + if let gestureRecognizers = view.gestureRecognizers { + for recognizer in gestureRecognizers { + if let recognizer = recognizer as? TapLongTapOrDoubleTapGestureRecognizer, recognizer !== gesture { + recognizer.cancel() + } + } + } + for subview in view.subviews { + cancelOtherGestures(gesture: gesture, view: subview) + } +} + private class TapLongTapOrDoubleTapGestureRecognizerTimerTarget: NSObject { weak var target: TapLongTapOrDoubleTapGestureRecognizer? @@ -119,6 +132,9 @@ public final class TapLongTapOrDoubleTapGestureRecognizer: UIGestureRecognizer, if let (location, _) = self.touchLocationAndTimestamp { self.lastRecognizedGestureAndLocation = (.longTap, location) if let longTap = self.longTap { + if let window = self.view?.window { + cancelOtherGestures(gesture: self, view: window) + } self.recognizedLongTap = true self.state = .began longTap(location, self) From 293d15212832d5d265ddd89b840dc5d600185857 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:16:54 +0400 Subject: [PATCH 18/34] Support modal avatar preview --- .../Sources/AvatarGalleryController.swift | 8 +++ .../AvatarGalleryItemFooterContentNode.swift | 4 +- .../TelegramUI/ChatController.swift | 56 +++++++++++++++++-- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift index d89cd9e3e7..3a1680e3ae 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift @@ -397,6 +397,14 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr } } + override public func preferredContentSizeForLayout(_ layout: ContainerViewLayout) -> CGSize? { + if let centralItemNode = self.galleryNode.pager.centralItemNode(), let itemSize = centralItemNode.contentSize() { + return itemSize.aspectFitted(layout.size) + } else { + return nil + } + } + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift index e5b960bbea..9c7f0e144b 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift @@ -21,6 +21,7 @@ private let dateFont = Font.regular(14.0) final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { private let context: AccountContext + private var presentationData: PresentationData private var strings: PresentationStrings private var dateTimeFormat: PresentationDateTimeFormat @@ -42,6 +43,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { init(context: AccountContext, presentationData: PresentationData) { self.context = context + self.presentationData = presentationData self.strings = presentationData.strings self.dateTimeFormat = presentationData.dateTimeFormat @@ -82,7 +84,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { var dateText: String? switch entry { case let .image(_, _, peer, date, _, _): - nameText = peer.displayTitle + nameText = peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: date) default: break diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 0ef227b635..2fb48cc767 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -352,6 +352,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } super.init(context: context, navigationBarPresentationData: navigationBarPresentationData, mediaAccessoryPanelVisibility: mediaAccessoryPanelVisibility, locationBroadcastPanelSource: locationBroadcastPanelSource) + switch mode { + case .overlay: + self.navigationPresentation = .standaloneModal + default: + break + } + self.blocksBackgroundWhenInOverlay = true self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) @@ -1723,6 +1730,23 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G case .peer: let avatarNode = ChatAvatarNavigationNode() avatarNode.chatController = self + avatarNode.contextAction = { [weak self] node, gesture in + guard let strongSelf = self, let peer = strongSelf.presentationInterfaceState.renderedPeer?.chatMainPeer, peer.smallProfileImage != nil else { + return + } + let galleryController = AvatarGalleryController(context: strongSelf.context, peer: peer, remoteEntries: nil, replaceRootController: { controller, ready in + }, synchronousLoad: true) + galleryController.setHintWillBePresentedInPreviewingContext(true) + + let items: [ContextMenuItem] = [ + .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, icon: { _ in nil }, action: { _, f in + f(.dismissWithoutContent) + self?.navigationButtonAction(.openChatInfo) + })) + ] + let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: galleryController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + strongSelf.presentInGlobalOverlay(contextController) + } chatInfoButtonItem = UIBarButtonItem(customDisplayNode: avatarNode)! /*case .group: chatInfoButtonItem = UIBarButtonItem(customDisplayNode: ChatMultipleAvatarsNavigationNode())!*/ @@ -4195,8 +4219,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.chatDisplayNode.dismissAsOverlay = { [weak self] in if let strongSelf = self { + strongSelf.statusBar.statusBarStyle = .Ignore strongSelf.chatDisplayNode.animateDismissAsOverlay(completion: { - self?.presentingViewController?.dismiss(animated: false, completion: nil) + self?.dismiss() }) } } @@ -4928,7 +4953,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G beginClear(.scheduledMessages) })) } else if canRemoveGlobally { - items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: self.presentationData.strings)) + items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder)) items.append(ActionSheetButtonItem(title: self.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.compactDisplayTitle).0, color: .destructive, action: { [weak actionSheet] in beginClear(.forEveryone) actionSheet?.dismissAnimated() @@ -5094,7 +5119,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return result } - let controller = legacyAttachmentMenu(context: strongSelf.context, peer: peer, editMediaOptions: menuEditMediaOptions, saveEditedPhotos: settings.storeEditedPhotos, allowGrouping: true, hasSchedule: !strongSelf.presentationInterfaceState.isScheduledMessages && peer.id.namespace != Namespaces.Peer.SecretChat, canSendPolls: canSendPolls, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, parentController: legacyController, recentlyUsedInlineBots: strongSelf.recentlyUsedInlineBotsValue, initialCaption: inputText.string, openGallery: { + let controller = legacyAttachmentMenu(context: strongSelf.context, peer: peer, editMediaOptions: menuEditMediaOptions, saveEditedPhotos: settings.storeEditedPhotos, allowGrouping: true, hasSchedule: !strongSelf.presentationInterfaceState.isScheduledMessages && peer.id.namespace != Namespaces.Peer.SecretChat, canSendPolls: canSendPolls, presentationData: strongSelf.presentationData, parentController: legacyController, recentlyUsedInlineBots: strongSelf.recentlyUsedInlineBotsValue, initialCaption: inputText.string, openGallery: { self?.presentMediaPicker(fileMode: false, editingMedia: editMediaOptions != nil, completion: { signals, silentPosting, scheduleTime in if !inputText.string.isEmpty { //strongSelf.clearInputText() @@ -5691,7 +5716,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G |> deliverOnMainQueue).start(next: { [weak self] settings in if let strongSelf = self, let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer { strongSelf.chatDisplayNode.dismissInput() - let _ = presentLegacyPasteMenu(context: strongSelf.context, peer: peer, saveEditedPhotos: settings.storeEditedPhotos, allowGrouping: true, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, images: images, sendMessagesWithSignals: { signals in + let _ = presentLegacyPasteMenu(context: strongSelf.context, peer: peer, saveEditedPhotos: settings.storeEditedPhotos, allowGrouping: true, presentationData: strongSelf.presentationData, images: images, sendMessagesWithSignals: { signals in self?.enqueueMediaMessages(signals: signals, silentPosting: false) }, present: { [weak self] controller, arguments in if let strongSelf = self { @@ -7267,7 +7292,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } else if categoryId == 2 { title = strongSelf.presentationData.strings.Conversation_Moderate_Report } else if categoryId == 3 { - title = strongSelf.presentationData.strings.Conversation_Moderate_DeleteAllMessages(author.displayTitle).0 + title = strongSelf.presentationData.strings.Conversation_Moderate_DeleteAllMessages(author.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0 } let index = itemIndex items.append(ActionSheetCheckboxItem(title: title, label: "", value: actions.contains(categoryId), action: { value in @@ -7781,3 +7806,24 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } } } + +private final class ContextControllerContentSourceImpl: ContextControllerContentSource { + let controller: ViewController + weak var sourceNode: ASDisplayNode? + + init(controller: ViewController, sourceNode: ASDisplayNode?) { + self.controller = controller + self.sourceNode = sourceNode + } + + func transitionInfo() -> ContextControllerTakeControllerInfo? { + let sourceNode = self.sourceNode + return ContextControllerTakeControllerInfo(contentAreaInScreenSpace: CGRect(origin: CGPoint(), size: CGSize(width: 10.0, height: 10.0)), sourceNode: { [weak sourceNode] in + if let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds) + } else { + return nil + } + }) + } +} From 57a8270c6b95cd112b062f919499657992a88090 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:19:49 +0400 Subject: [PATCH 19/34] Update layout --- .../TelegramUI/ChatAvatarNavigationNode.swift | 22 ++++++++++++++++--- .../TelegramUI/ChatControllerNode.swift | 8 +++---- .../ChatInputContextPanelNode.swift | 2 +- .../CommandChatInputContextPanelNode.swift | 6 ++--- ...textResultsChatInputContextPanelNode.swift | 6 ++--- .../EmojisChatInputContextPanelNode.swift | 6 ++--- .../HashtagChatInputContextPanelNode.swift | 6 ++--- ...textResultsChatInputContextPanelNode.swift | 2 +- ...rizontalStickersChatContextPanelNode.swift | 8 +++---- .../StickersChatInputContextPanelNode.swift | 8 +++---- ...textResultsChatInputContextPanelNode.swift | 6 ++--- 11 files changed, 48 insertions(+), 32 deletions(-) diff --git a/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift b/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift index a37a04c55b..d2344a4d11 100644 --- a/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import AvatarNode +import ContextUI private let normalFont = UIFont(name: ".SFCompactRounded-Semibold", size: 16.0)! private let smallFont = UIFont(name: ".SFCompactRounded-Semibold", size: 12.0)! @@ -27,7 +28,11 @@ final class ChatAvatarNavigationNodeView: UIView, PreviewingHostView { } final class ChatAvatarNavigationNode: ASDisplayNode { + private let containerNode: ContextControllerSourceNode let avatarNode: AvatarNode + + var contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? + weak var chatController: ChatControllerImpl? { didSet { if self.isNodeLoaded { @@ -37,6 +42,7 @@ final class ChatAvatarNavigationNode: ASDisplayNode { } override init() { + self.containerNode = ContextControllerSourceNode() self.avatarNode = AvatarNode(font: normalFont) super.init() @@ -45,7 +51,15 @@ final class ChatAvatarNavigationNode: ASDisplayNode { return ChatAvatarNavigationNodeView() }) - self.addSubnode(self.avatarNode) + self.containerNode.addSubnode(self.avatarNode) + self.addSubnode(self.containerNode) + + self.containerNode.activated = { [weak self] gesture in + guard let strongSelf = self else { + return + } + strongSelf.contextAction?(strongSelf.containerNode, gesture) + } } override func didLoad() { @@ -69,12 +83,14 @@ final class ChatAvatarNavigationNode: ASDisplayNode { if !self.avatarNode.bounds.size.equalTo(bounds.size) { self.avatarNode.font = smallFont } - self.avatarNode.frame = bounds.offsetBy(dx: 8.0, dy: 0.0) + self.containerNode.frame = bounds.offsetBy(dx: 8.0, dy: 0.0) + self.avatarNode.frame = bounds } else { if !self.avatarNode.bounds.size.equalTo(bounds.size) { self.avatarNode.font = normalFont } - self.avatarNode.frame = bounds.offsetBy(dx: 10.0, dy: 1.0) + self.containerNode.frame = bounds.offsetBy(dx: 10.0, dy: 1.0) + self.avatarNode.frame = bounds } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index 2ca8d803f9..100a1fd6dd 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -1089,12 +1089,12 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { startPanelFrame.origin.y = referenceFrame.maxY - panelFrame.height } inputContextPanelNode.frame = startPanelFrame - inputContextPanelNode.updateLayout(size: startPanelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: .immediate, interfaceState: self.chatPresentationInterfaceState) + inputContextPanelNode.updateLayout(size: startPanelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: 0.0, transition: .immediate, interfaceState: self.chatPresentationInterfaceState) } if !inputContextPanelNode.frame.equalTo(panelFrame) || inputContextPanelNode.theme !== self.chatPresentationInterfaceState.theme { transition.updateFrame(node: inputContextPanelNode, frame: panelFrame) - inputContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition, interfaceState: self.chatPresentationInterfaceState) + inputContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: 0.0, transition: transition, interfaceState: self.chatPresentationInterfaceState) } } @@ -1102,10 +1102,10 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { let panelFrame = overlayContextPanelNode.placement == .overTextInput ? inputContextPanelsOverMainPanelFrame : inputContextPanelsFrame if immediatelyLayoutOverlayContextPanelAndAnimateAppearance { overlayContextPanelNode.frame = panelFrame - overlayContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: .immediate, interfaceState: self.chatPresentationInterfaceState) + overlayContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: 0.0, transition: .immediate, interfaceState: self.chatPresentationInterfaceState) } else if !overlayContextPanelNode.frame.equalTo(panelFrame) { transition.updateFrame(node: overlayContextPanelNode, frame: panelFrame) - overlayContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition, interfaceState: self.chatPresentationInterfaceState) + overlayContextPanelNode.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: 0.0, transition: transition, interfaceState: self.chatPresentationInterfaceState) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift index 2e74ea51aa..57fb47a57c 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift @@ -24,7 +24,7 @@ class ChatInputContextPanelNode: ASDisplayNode { super.init() } - func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { } func animateOut(completion: @escaping () -> Void) { diff --git a/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift index 4af459c6ef..d4e97f075b 100644 --- a/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift @@ -59,7 +59,7 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode { private var currentEntries: [CommandChatInputContextPanelEntry]? private var enqueuedTransitions: [(CommandChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { self.listView = ListView() @@ -181,9 +181,9 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode { return max(size.height - minimumItemHeights, 0.0) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) var insets = UIEdgeInsets() insets.top = self.topInsetForLayout(size: size) diff --git a/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift index 56e45b7044..6b2d3743cb 100644 --- a/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift @@ -12,7 +12,7 @@ final class DisabledContextResultsChatInputContextPanelNode: ChatInputContextPan private let separatorNode: ASDisplayNode private let textNode: ImmediateTextNode - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { self.containerNode = ASDisplayNode() @@ -31,10 +31,10 @@ final class DisabledContextResultsChatInputContextPanelNode: ChatInputContextPan self.addSubnode(self.containerNode) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let firstLayout = self.validLayout == nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) self.containerNode.backgroundColor = interfaceState.theme.list.plainBackgroundColor self.separatorNode.backgroundColor = interfaceState.theme.list.itemPlainSeparatorColor diff --git a/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift index 43de2f7b13..71eca67836 100644 --- a/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift @@ -101,7 +101,7 @@ final class EmojisChatInputContextPanelNode: ChatInputContextPanelNode { private var currentEntries: [EmojisChatInputContextPanelEntry]? private var enqueuedTransitions: [(EmojisChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { self.backgroundNode = ASImageNode() @@ -220,9 +220,9 @@ final class EmojisChatInputContextPanelNode: ChatInputContextPanelNode { } } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) let sideInsets: CGFloat = 10.0 + leftInset let contentWidth = min(size.width - sideInsets - sideInsets, max(24.0, CGFloat(self.currentEntries?.count ?? 0) * 45.0)) diff --git a/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift index bb0ac4cbaf..b61f4ba0ee 100644 --- a/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift @@ -60,7 +60,7 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { private var currentEntries: [HashtagChatInputContextPanelEntry]? private var enqueuedTransitions: [(HashtagChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { self.listView = ListView() @@ -180,9 +180,9 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { return max(size.height - minimumItemHeights, 0.0) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) var insets = UIEdgeInsets() insets.top = self.topInsetForLayout(size: size) diff --git a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift index 60dfca9fb6..f8bd4cfb7f 100644 --- a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift @@ -299,7 +299,7 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont } } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let listHeight: CGFloat = 105.0 transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: size.height - listHeight), size: CGSize(width: size.width, height: UIScreenPixel))) diff --git a/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift index b63b7ce1b7..32cf8b9290 100755 --- a/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift @@ -99,7 +99,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private let clippingNode: ASDisplayNode private let gridNode: GridNode - private var validLayout: (CGSize, CGFloat, CGFloat, ChatPresentationInterfaceState)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat, ChatPresentationInterfaceState)? private var currentEntries: [StickerEntry] = [] private var enqueuedTransitions: [StickerEntryTransition] = [] @@ -246,7 +246,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { self.currentEntries = entries if let validLayout = self.validLayout { - self.updateLayout(size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, transition: .immediate, interfaceState: validLayout.3) + self.updateLayout(size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, bottomInset: validLayout.3, transition: .immediate, interfaceState: validLayout.4) } let transition = preparedGridEntryTransition(account: self.context.account, from: previousEntries, to: entries, stickersInteraction: self.stickersInteraction, interfaceInteraction: self.interfaceInteraction!) @@ -267,7 +267,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let sideInsets: CGFloat = 10.0 + leftInset let contentWidth = min(size.width - sideInsets - sideInsets, max(24.0, CGFloat(self.currentEntries.count) * 66.0 + 6.0)) @@ -298,7 +298,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: CGSize(width: gridFrame.size.height, height: gridFrame.size.width), insets: UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0), preloadSize: 100.0, type: .fixed(itemSize: CGSize(width: 66.0, height: 66.0), fillWidth: nil, lineSpacing: 0.0, itemSpacing: nil)), transition: .immediate), itemTransition: .immediate, stationaryItems: .all, updateFirstIndexInSectionOffset: nil), completion: { _ in }) let dequeue = self.validLayout == nil - self.validLayout = (size, leftInset, rightInset, interfaceState) + self.validLayout = (size, leftInset, rightInset, bottomInset, interfaceState) if dequeue { self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) diff --git a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift index 33e5ac327a..1b64b3631a 100644 --- a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift @@ -72,7 +72,7 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { private var currentEntries: [StickersChatInputContextPanelEntry]? private var enqueuedTransitions: [(StickersChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat, ChatPresentationInterfaceState)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat, ChatPresentationInterfaceState)? public var controllerInteraction: ChatControllerInteraction? private let stickersInteraction: StickersChatInputContextPanelInteraction @@ -240,7 +240,7 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { } if updateLayout { - self.updateLayout(size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, transition: .immediate, interfaceState: validLayout.3) + self.updateLayout(size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, bottomInset: validLayout.3, transition: .immediate, interfaceState: validLayout.4) } self.prepareTransition(from: self.currentEntries, to: entries) @@ -307,9 +307,9 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { return max(size.height - minimumItemHeights, 0.0) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset, interfaceState) + self.validLayout = (size, leftInset, rightInset, bottomInset, interfaceState) var insets = UIEdgeInsets() insets.top = self.topInsetForLayout(size: size) diff --git a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift index 31c7f122f8..15d402a5ca 100644 --- a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift @@ -124,7 +124,7 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex private var currentEntries: [VerticalListContextResultsChatInputContextPanelEntry]? private var enqueuedTransitions: [(VerticalListContextResultsChatInputContextPanelTransition, Bool)] = [] - private var validLayout: (CGSize, CGFloat, CGFloat)? + private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { self.listView = ListView() @@ -244,9 +244,9 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex return max(size.height - minimumItemHeights, 0.0) } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { let hadValidLayout = self.validLayout != nil - self.validLayout = (size, leftInset, rightInset) + self.validLayout = (size, leftInset, rightInset, bottomInset) var insets = UIEdgeInsets() insets.top = self.topInsetForLayout(size: size, hasSwitchPeer: self.currentResults?.switchPeer != nil) From 6ef163cf1d6edb72389f76d9e28ebe6d00e624dc Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:20:04 +0400 Subject: [PATCH 20/34] Fix item ordering --- .../Sources/Privacy and Security/BlockedPeersController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift index 2b10cb8354..ee99ace770 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/BlockedPeersController.swift @@ -106,9 +106,9 @@ private enum BlockedPeersEntry: ItemListNodeEntry { switch lhs { case .add: if case .add = rhs { - return true - } else { return false + } else { + return true } case let .peerItem(index, _, _, _, _, _, _, _): switch rhs { From 2f99bea37a039387c8a864a873e1842f45c8b955 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:20:42 +0400 Subject: [PATCH 21/34] Display in-app notifications as modal screens --- submodules/TelegramUI/TelegramUI/ApplicationContext.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift index 2129d433b3..db88e74862 100644 --- a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift +++ b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift @@ -461,7 +461,9 @@ final class AuthorizedApplicationContext { if let strongSelf = self { let chatController = ChatControllerImpl(context: strongSelf.context, chatLocation: .peer(firstMessage.id.peerId), mode: .overlay) //chatController.navigation_setNavigationController(strongSelf.rootController) - (strongSelf.rootController.viewControllers.last as? ViewController)?.present(chatController, in: .window(.root), with: ChatControllerOverlayPresentationData(expandData: expandData())) + chatController.presentationArguments = ChatControllerOverlayPresentationData(expandData: expandData()) + strongSelf.rootController.pushViewController(chatController) + //(strongSelf.rootController.viewControllers.last as? ViewController)?.present(chatController, in: .window(.root), with: ChatControllerOverlayPresentationData(expandData: expandData())) } })) } From 5536cad24e49050beedc746b3d6e235f8d1fb4ea Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:20:55 +0400 Subject: [PATCH 22/34] Add toast text insets --- submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift index 9f22021bc4..66eea3e6ab 100644 --- a/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift @@ -31,6 +31,7 @@ final class ChatToastAlertPanelNode: ChatTitleAccessoryPanelNode { self.titleNode = ImmediateTextNode() self.titleNode.attributedText = NSAttributedString(string: "", font: Font.regular(14.0), textColor: UIColor.black) self.titleNode.maximumNumberOfLines = 1 + self.titleNode.insets = UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0) super.init() From 8665208520cc256a99dde3457e868d1281194c68 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:21:37 +0400 Subject: [PATCH 23/34] Don't allow replies while searching --- .../TelegramUI/ChatInterfaceStateContextMenus.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift index 157e153f9a..ebfe162245 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift @@ -119,6 +119,12 @@ func canReplyInChat(_ chatPresentationInterfaceState: ChatPresentationInterfaceS guard !chatPresentationInterfaceState.isScheduledMessages else { return false } + switch chatPresentationInterfaceState.mode { + case .inline: + return false + default: + break + } var canReply = false switch chatPresentationInterfaceState.chatLocation { From 846e16c2352c3a155cf176797a6e0999a6065d82 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:22:09 +0400 Subject: [PATCH 24/34] Simplify widget data loading --- BUCK | 4 +- .../TelegramUI/SharedAccountContext.swift | 7 ++ .../TelegramUI/WidgetDataContext.swift | 49 +++++++++++++ submodules/WidgetItems/BUCK | 11 +++ .../WidgetItems/Sources/WidgetItems.swift | 72 +++++++++++++++++++ 5 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 submodules/TelegramUI/TelegramUI/WidgetDataContext.swift create mode 100644 submodules/WidgetItems/BUCK create mode 100644 submodules/WidgetItems/Sources/WidgetItems.swift diff --git a/BUCK b/BUCK index dcbd57d9f1..06a249ef20 100644 --- a/BUCK +++ b/BUCK @@ -241,10 +241,8 @@ apple_binary( "@executable_path/../../Frameworks", ], deps = [ - "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", - "//submodules/TelegramCore:TelegramCore#shared", - "//submodules/Postbox:Postbox#shared", "//submodules/BuildConfig:BuildConfig", + "//submodules/WidgetItems:WidgetItems", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/UIKit.framework", diff --git a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift b/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift index d6788a0011..dfc4d08f06 100644 --- a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift +++ b/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift @@ -143,6 +143,8 @@ public final class SharedAccountContextImpl: SharedAccountContext { private let displayUpgradeProgress: (Float?) -> Void + private var widgetDataContext: WidgetDataContext? + public init(mainWindow: Window1?, basePath: String, encryptionParameters: ValueBoxEncryptionParameters, accountManager: AccountManager, applicationBindings: TelegramApplicationBindings, initialPresentationDataAndSettings: InitialPresentationDataAndSettings, networkArguments: NetworkInitializationArguments, rootPath: String, legacyBasePath: String?, legacyCache: LegacyCache?, apsNotificationToken: Signal, voipNotificationToken: Signal, setNotificationCall: @escaping (PresentationCall?) -> Void, navigateToChat: @escaping (AccountRecordId, PeerId, MessageId?) -> Void, displayUpgradeProgress: @escaping (Float?) -> Void = { _ in }) { assert(Queue.mainQueue().isCurrent()) @@ -609,6 +611,11 @@ public final class SharedAccountContextImpl: SharedAccountContext { let _ = managedCleanupAccounts(networkArguments: networkArguments, accountManager: self.accountManager, rootPath: rootPath, auxiliaryMethods: telegramAccountAuxiliaryMethods, encryptionParameters: encryptionParameters).start() self.updateNotificationTokensRegistration() + + self.widgetDataContext = WidgetDataContext(basePath: self.basePath, activeAccount: self.activeAccounts + |> map { primary, _, _ in + return primary + }) } deinit { diff --git a/submodules/TelegramUI/TelegramUI/WidgetDataContext.swift b/submodules/TelegramUI/TelegramUI/WidgetDataContext.swift new file mode 100644 index 0000000000..0c96ef9a34 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/WidgetDataContext.swift @@ -0,0 +1,49 @@ +import Foundation +import SwiftSignalKit +import Postbox +import TelegramCore +import WidgetItems + +final class WidgetDataContext { + private var currentAccount: Account? + private var currentAccountDisposable: Disposable? + + init(basePath: String, activeAccount: Signal) { + self.currentAccountDisposable = (activeAccount + |> distinctUntilChanged(isEqual: { lhs, rhs in + return lhs === rhs + }) + |> mapToSignal { account -> Signal in + guard let account = account else { + return .single(.notAuthorized) + } + return recentPeers(account: account) + |> map { result -> WidgetData in + switch result { + case .disabled: + return .disabled + case let .peers(peers): + return .peers(WidgetDataPeers(accountPeerId: account.peerId.toInt64(), peers: peers.compactMap { peer -> WidgetDataPeer? in + guard let user = peer as? TelegramUser else { + return nil + } + return WidgetDataPeer(id: user.id.toInt64(), name: user.shortNameOrPhone ?? "", letters: user.displayLetters, avatarPath: smallestImageRepresentation(user.photo).flatMap { representation in + return account.postbox.mediaBox.resourcePath(representation.resource) + }) + })) + } + } + }).start(next: { widgetData in + let path = basePath + "/widget-data" + if let data = try? JSONEncoder().encode(widgetData) { + let _ = try? data.write(to: URL(fileURLWithPath: path), options: [.atomic]) + } else { + let _ = try? FileManager.default.removeItem(atPath: path) + } + }) + } + + deinit { + self.currentAccountDisposable?.dispose() + } +} diff --git a/submodules/WidgetItems/BUCK b/submodules/WidgetItems/BUCK new file mode 100644 index 0000000000..5a23f7b104 --- /dev/null +++ b/submodules/WidgetItems/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "WidgetItems", + srcs = glob([ + "Sources/**/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/WidgetItems/Sources/WidgetItems.swift b/submodules/WidgetItems/Sources/WidgetItems.swift new file mode 100644 index 0000000000..51036dfc6d --- /dev/null +++ b/submodules/WidgetItems/Sources/WidgetItems.swift @@ -0,0 +1,72 @@ +import Foundation + +public enum WidgetCodingError: Error { + case generic +} + +public struct WidgetDataPeer: Codable, Equatable { + public var id: Int64 + public var name: String + public var letters: [String] + public var avatarPath: String? + + public init(id: Int64, name: String, letters: [String], avatarPath: String?) { + self.id = id + self.name = name + self.letters = letters + self.avatarPath = avatarPath + } +} + +public struct WidgetDataPeers: Codable, Equatable { + public var accountPeerId: Int64 + public var peers: [WidgetDataPeer] + + public init(accountPeerId: Int64, peers: [WidgetDataPeer]) { + self.accountPeerId = accountPeerId + self.peers = peers + } +} + +public enum WidgetData: Codable, Equatable { + private enum CodingKeys: CodingKey { + case discriminator + case peers + } + + private enum Cases: Int32, Codable { + case notAuthorized + case disabled + case peers + } + + case notAuthorized + case disabled + case peers(WidgetDataPeers) + + public init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + let discriminator = try container.decode(Cases.self, forKey: .discriminator) + switch discriminator { + case .notAuthorized: + self = .notAuthorized + case .disabled: + self = .disabled + case .peers: + self = .peers(try container.decode(WidgetDataPeers.self, forKey: .peers)) + } + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + switch self { + case .notAuthorized: + try container.encode(Cases.notAuthorized, forKey: .discriminator) + case .disabled: + try container.encode(Cases.disabled, forKey: .discriminator) + case let .peers(peers): + try container.encode(Cases.peers, forKey: .discriminator) + try container.encode(peers, forKey: .peers) + } + } +} From 29e6e29816d32eda14d5e45ab11404e22cc82505 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:22:23 +0400 Subject: [PATCH 25/34] Fix inline location queries --- .../TelegramUI/ChatInterfaceStateContextQueries.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift index b1e2ba79d1..1294e0a49a 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift @@ -9,6 +9,7 @@ import TextFormat import AccountContext import Emoji import SearchPeerMembers +import DeviceLocationManager enum ChatContextQueryError { case inlineBotLocationRequest(PeerId) @@ -243,7 +244,12 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee |> castError(ChatContextQueryError.self) |> mapToSignal { peer -> Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, ChatContextQueryError> in if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder { - let contextResults = requestChatContextResults(account: context.account, botId: user.id, peerId: chatPeer.id, query: query, offset: "") + let contextResults = requestChatContextResults(account: context.account, botId: user.id, peerId: chatPeer.id, query: query, location: context.sharedContext.locationManager.flatMap { locationManager in + return currentLocationManagerCoordinate(manager: locationManager, timeout: 5.0) + |> flatMap { coordinate -> (Double, Double) in + return (coordinate.latitude, coordinate.longitude) + } + } ?? .single(nil), offset: "") |> mapError { error -> ChatContextQueryError in return .inlineBotLocationRequest(user.id) } From 841ecaba39c8ee056d6a467c07fdd359688c3271 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:22:41 +0400 Subject: [PATCH 26/34] Support widget data --- Widget/PeerNode.swift | 22 ++-- Widget/TodayViewController.swift | 173 +++++-------------------------- 2 files changed, 35 insertions(+), 160 deletions(-) diff --git a/Widget/PeerNode.swift b/Widget/PeerNode.swift index 9600ebe22f..2e731fdd30 100644 --- a/Widget/PeerNode.swift +++ b/Widget/PeerNode.swift @@ -1,7 +1,6 @@ import Foundation -import Postbox -import TelegramCore import UIKit +import WidgetItems private extension UIColor { convenience init(rgb: UInt32) { @@ -53,7 +52,7 @@ private let deviceColorSpace: CGColorSpace = { } }() -private func avatarViewLettersImage(size: CGSize, peerId: PeerId, accountPeerId: PeerId, letters: [String]) -> UIImage? { +private func avatarViewLettersImage(size: CGSize, peerId: Int64, accountPeerId: Int64, letters: [String]) -> UIImage? { UIGraphicsBeginImageContextWithOptions(size, false, 0.0) let context = UIGraphicsGetCurrentContext() @@ -61,7 +60,7 @@ private func avatarViewLettersImage(size: CGSize, peerId: PeerId, accountPeerId: context?.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height)) context?.clip() - let colorIndex = abs(Int(accountPeerId.id + peerId.id)) + let colorIndex = abs(Int(accountPeerId + peerId)) let colorsArray = gradientColors[colorIndex % gradientColors.count] var locations: [CGFloat] = [1.0, 0.0] @@ -98,13 +97,13 @@ private func avatarViewLettersImage(size: CGSize, peerId: PeerId, accountPeerId: private let avatarSize = CGSize(width: 50.0, height: 50.0) private final class AvatarView: UIImageView { - init(account: Account, peer: Peer, size: CGSize) { + init(accountPeerId: Int64, peer: WidgetDataPeer, size: CGSize) { super.init(frame: CGRect()) - if let resource = peer.smallProfileImage?.resource, let path = account.postbox.mediaBox.completedResourcePath(resource), let image = UIImage(contentsOfFile: path), let roundImage = avatarRoundImage(size: size, source: image) { + if let path = peer.avatarPath, let image = UIImage(contentsOfFile: path), let roundImage = avatarRoundImage(size: size, source: image) { self.image = roundImage } else { - self.image = avatarViewLettersImage(size: size, peerId: peer.id, accountPeerId: account.peerId, letters: peer.displayLetters) + self.image = avatarViewLettersImage(size: size, peerId: peer.id, accountPeerId: accountPeerId, letters: peer.letters) } } @@ -114,19 +113,20 @@ private final class AvatarView: UIImageView { } final class PeerView: UIView { - let peer: Peer + let peer: WidgetDataPeer private let avatarView: AvatarView private let titleLabel: UILabel private let tapped: () -> Void - init(account: Account, peer: Peer, tapped: @escaping () -> Void) { + init(accountPeerId: Int64, peer: WidgetDataPeer, tapped: @escaping () -> Void) { self.peer = peer self.tapped = tapped - self.avatarView = AvatarView(account: account, peer: peer, size: avatarSize) + self.avatarView = AvatarView(accountPeerId: accountPeerId, peer: peer, size: avatarSize) self.titleLabel = UILabel() - self.titleLabel.text = peer.compactDisplayTitle + let title = peer.name + self.titleLabel.text = title self.titleLabel.textColor = .black self.titleLabel.font = UIFont.systemFont(ofSize: 11.0) self.titleLabel.lineBreakMode = .byTruncatingTail diff --git a/Widget/TodayViewController.swift b/Widget/TodayViewController.swift index dd691a91b5..28de6e77f2 100644 --- a/Widget/TodayViewController.swift +++ b/Widget/TodayViewController.swift @@ -1,57 +1,26 @@ import UIKit -import TelegramCore -import SwiftSignalKit -import Postbox import NotificationCenter import BuildConfig +import WidgetItems -private var installedSharedLogger = false - -private func setupSharedLogger(_ path: String) { - if !installedSharedLogger { - installedSharedLogger = true - Logger.setSharedLogger(Logger(basePath: path)) - } +private func rootPathForBasePath(_ appGroupPath: String) -> String { + return appGroupPath + "/telegram-data" } -private let auxiliaryMethods = AccountAuxiliaryMethods(updatePeerChatInputState: { _, _ in - return nil -}, fetchResource: { _, _, _, _ in - return nil -}, fetchResourceMediaReferenceHash: { _ in - return .single(nil) -}, prepareSecretThumbnailData: { _ in - return nil -}) - @objc(TodayViewController) class TodayViewController: UIViewController, NCWidgetProviding { private var initializedInterface = false - private let disposable = MetaDisposable() private var buildConfig: BuildConfig? - deinit { - self.disposable.dispose() - } - - private var snapshotView: UIImageView? - override func viewDidLoad() { super.viewDidLoad() - self.snapshotView?.removeFromSuperview() - let snapshotView = UIImageView() - if let path = self.getSnapshotPath(), let image = UIImage(contentsOfFile: path) { - snapshotView.image = image - } - self.snapshotView = snapshotView - self.view.addSubview(snapshotView) - if self.initializedInterface { return } self.initializedInterface = true + let appBundleIdentifier = Bundle.main.bundleIdentifier! guard let lastDotRange = appBundleIdentifier.range(of: ".", options: [.backwards]) else { return @@ -61,9 +30,6 @@ class TodayViewController: UIViewController, NCWidgetProviding { let buildConfig = BuildConfig(baseAppBundleId: baseAppBundleId) self.buildConfig = buildConfig - let apiId: Int32 = buildConfig.apiId - let languagesCategory = "ios" - let appGroupName = "group.\(baseAppBundleId)" let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName) @@ -72,56 +38,11 @@ class TodayViewController: UIViewController, NCWidgetProviding { } let rootPath = rootPathForBasePath(appGroupUrl.path) - performAppGroupUpgrades(appGroupPath: appGroupUrl.path, rootPath: rootPath) + let dataPath = rootPath + "/widget-data" - TempBox.initializeShared(basePath: rootPath, processType: "widget", launchSpecificId: arc4random64()) - - let logsPath = rootPath + "/today-logs" - let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil) - - setupSharedLogger(logsPath) - - let account: Signal - let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown" - initializeAccountManagement() - let accountManager = AccountManager(basePath: rootPath + "/accounts-metadata") - - let deviceSpecificEncryptionParameters = BuildConfig.deviceSpecificEncryptionParameters(rootPath, baseAppBundleId: baseAppBundleId) - let encryptionParameters = ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: deviceSpecificEncryptionParameters.key)!, salt: ValueBoxEncryptionParameters.Salt(data: deviceSpecificEncryptionParameters.salt)!) - - account = currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0, appData: .single(buildConfig.bundleData(withAppToken: nil))), supplementary: true, manager: accountManager, rootPath: rootPath, auxiliaryMethods: auxiliaryMethods, encryptionParameters: encryptionParameters) - |> mapToSignal { account -> Signal in - if let account = account { - switch account { - case .upgrading: - return .complete() - case let .authorized(account): - return .single(account) - case .unauthorized: - return .complete() - } - } else { - return .complete() - } + if let data = try? Data(contentsOf: URL(fileURLWithPath: dataPath)), let widgetData = try? JSONDecoder().decode(WidgetData.self, from: data) { + self.setWidgetData(widgetData: widgetData) } - - let applicationInterface = account - |> deliverOnMainQueue - |> afterNext { [weak self] account in - let _ = (recentPeers(account: account) - |> deliverOnMainQueue).start(next: { peers in - if let strongSelf = self { - switch peers { - case let .peers(peers): - strongSelf.setPeers(account: account, peers: peers.filter { !$0.isDeleted }) - case .disabled: - strongSelf.setPeers(account: account, peers: []) - } - } - }) - } - - self.disposable.set(applicationInterface.start()) } func widgetPerformUpdate(completionHandler: (@escaping (NCUpdateResult) -> Void)) { @@ -133,34 +54,37 @@ class TodayViewController: UIViewController, NCWidgetProviding { } - private var peers: [Peer]? + private var widgetData: WidgetData? - private func setPeers(account: Account, peers: [Peer]) { - self.peers = peers + private func setWidgetData(widgetData: WidgetData) { + self.widgetData = widgetData self.peerViews.forEach { $0.removeFromSuperview() } self.peerViews = [] - for peer in peers { - let peerView = PeerView(account: account, peer: peer, tapped: { [weak self] in - if let strongSelf = self, let buildConfig = strongSelf.buildConfig { - if let url = URL(string: "\(buildConfig.appSpecificUrlScheme)://localpeer?id=\(peer.id.toInt64())") { - strongSelf.extensionContext?.open(url, completionHandler: nil) + switch widgetData { + case .notAuthorized, .disabled: + break + case let .peers(peers): + for peer in peers.peers { + let peerView = PeerView(accountPeerId: peers.accountPeerId, peer: peer, tapped: { [weak self] in + if let strongSelf = self, let buildConfig = strongSelf.buildConfig { + if let url = URL(string: "\(buildConfig.appSpecificUrlScheme)://localpeer?id=\(peer.id)") { + strongSelf.extensionContext?.open(url, completionHandler: nil) + } } - } - }) - self.view.addSubview(peerView) - self.peerViews.append(peerView) + }) + self.view.addSubview(peerView) + self.peerViews.append(peerView) + } } - self.validSnapshotSize = nil if let size = self.validLayout { self.updateLayout(size: size) } } private var validLayout: CGSize? - private var validSnapshotSize: CGSize? private var peerViews: [PeerView] = [] @@ -173,11 +97,6 @@ class TodayViewController: UIViewController, NCWidgetProviding { private func updateLayout(size: CGSize) { self.validLayout = size - if let image = self.snapshotView?.image { - let scale = UIScreen.main.scale - self.snapshotView?.frame = CGRect(origin: CGPoint(), size: CGSize(width: image.size.width / scale, height: image.size.height / scale)) - } - let peerSize = CGSize(width: 70.0, height: 100.0) var peerFrames: [CGRect] = [] @@ -205,49 +124,5 @@ class TodayViewController: UIViewController, NCWidgetProviding { peerView.updateLayout(size: peerFrames[i].size) offset += peerFrames[i].width + spacing } - - if self.peers != nil { - self.snapshotView?.removeFromSuperview() - if self.validSnapshotSize != size { - self.validSnapshotSize = size - self.updateSnapshot() - } - } - } - - private func updateSnapshot() { - if let path = self.getSnapshotPath() { - DispatchQueue.main.async { - UIGraphicsBeginImageContextWithOptions(self.view.bounds.size, false, 0.0) - self.view.drawHierarchy(in: self.view.bounds, afterScreenUpdates: false) - let image = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - if let image = image, let data = image.pngData() { - let _ = try? FileManager.default.removeItem(atPath: path) - do { - try data.write(to: URL(fileURLWithPath: path)) - } catch let e { - print("\(e)") - } - } - } - } - } - - private func getSnapshotPath() -> String? { - let appBundleIdentifier = Bundle.main.bundleIdentifier! - guard let lastDotRange = appBundleIdentifier.range(of: ".", options: [.backwards]) else { - return nil - } - - let appGroupName = "group.\(appBundleIdentifier[.. Date: Fri, 11 Oct 2019 16:23:02 +0400 Subject: [PATCH 27/34] Add postbox transaction guard --- submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift index e6d31125b9..2abd8eed61 100644 --- a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift +++ b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift @@ -324,6 +324,8 @@ public final class SharedWakeupManager { private func updateAccounts(hasTasks: Bool) { if self.inForeground || self.hasActiveAudioSession || self.isInBackgroundExtension || (hasTasks && self.currentExternalCompletion != nil) || self.activeExplicitExtensionTimer != nil { for (account, primary, tasks) in self.accountsAndTasks { + account.postbox.setCanBeginTransactions(true) + if (self.inForeground && primary) || !tasks.isEmpty || (self.activeExplicitExtensionTimer != nil && primary) { account.shouldBeServiceTaskMaster.set(.single(.always)) } else { @@ -335,6 +337,7 @@ public final class SharedWakeupManager { } } else { for (account, _, _) in self.accountsAndTasks { + account.postbox.setCanBeginTransactions(false) account.shouldBeServiceTaskMaster.set(.single(.never)) account.shouldKeepOnlinePresence.set(.single(false)) account.shouldKeepBackgroundDownloadConnections.set(.single(false)) From 018568aac69216992c917c69274a1ed7e3ecaf5e Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:23:17 +0400 Subject: [PATCH 28/34] Remove WakeupManager --- .../TelegramUI/TelegramUI/WakeupManager.swift | 308 ------------------ 1 file changed, 308 deletions(-) delete mode 100644 submodules/TelegramUI/TelegramUI/WakeupManager.swift diff --git a/submodules/TelegramUI/TelegramUI/WakeupManager.swift b/submodules/TelegramUI/TelegramUI/WakeupManager.swift deleted file mode 100644 index 252abefacc..0000000000 --- a/submodules/TelegramUI/TelegramUI/WakeupManager.swift +++ /dev/null @@ -1,308 +0,0 @@ -import Foundation -import TelegramCore -import SwiftSignalKit -import UIKit -import Postbox -import UserNotifications -import TelegramUIPreferences -import AccountContext - -private final class WakeupManagerTask { - let nativeId: UIBackgroundTaskIdentifier - let id: Int32 - let timer: SwiftSignalKit.Timer - - init(nativeId: UIBackgroundTaskIdentifier, id: Int32, timer: SwiftSignalKit.Timer) { - self.nativeId = nativeId - self.id = id - self.timer = timer - } - - deinit { - assert(Queue.mainQueue().isCurrent()) - self.timer.invalidate() - } -} - -private final class WakeupManagerState { - var nextTaskId: Int32 = 0 - var currentTask: WakeupManagerTask? - var currentServiceTask: WakeupManagerTask? -} - -private struct CombinedRunningImportantTasks: Equatable { - let serviceTasks: AccountRunningImportantTasks - let downloadTasks: Bool - let backgroundLocation: Bool - let watchTasks: WatchRunningTasks? - - var isEmpty: Bool { - var hasWatchTask = false - if let watchTasks = self.watchTasks { - hasWatchTask = watchTasks.running - } - return self.serviceTasks.isEmpty && !self.backgroundLocation && !hasWatchTask && !self.downloadTasks - } -} - -final class WakeupManager { - private let accountManager: AccountManager - private var state = WakeupManagerState() - - private let isProcessingNotificationsValue = ValuePromise(false, ignoreRepeated: true) - private let isProcessingServiceTasksValue = ValuePromise(false, ignoreRepeated: true) - var isWokenUp: Signal { - return combineLatest([self.isProcessingNotificationsValue.get(), isProcessingServiceTasksValue.get()]) - |> map { values -> Bool in - for value in values { - if value { - return true - } - } - return false - } - } - - private var inForegroundDisposable: Disposable? - private var runningServiceTasksDisposable: Disposable? - private var runningServiceTasksValue: CombinedRunningImportantTasks = CombinedRunningImportantTasks(serviceTasks: [], downloadTasks: false, backgroundLocation: false, watchTasks: nil) - private let wakeupDisposable = MetaDisposable() - - private var wakeupResultSubscribers: [(Int32, ([MessageId]) -> Signal)] = [] - - init(accountManager: AccountManager, inForeground: Signal, runningServiceTasks: Signal, runningBackgroundLocationTasks: Signal, runningWatchTasks: Signal, runningDownloadTasks: Signal) { - self.accountManager = accountManager - - self.inForegroundDisposable = (inForeground |> distinctUntilChanged |> deliverOnMainQueue).start(next: { [weak self] value in - if let strongSelf = self { - if value { - if let currentTask = strongSelf.state.currentTask { - strongSelf.state.currentTask = nil - Logger.shared.log("WakeupManager", "ending task #\(currentTask.id) (entered foreground)") - currentTask.timer.invalidate() - strongSelf.wakeupDisposable.set(nil) - strongSelf.isProcessingNotificationsValue.set(false) - UIApplication.shared.endBackgroundTask(currentTask.nativeId) - } - } - } - }) - self.runningServiceTasksDisposable = (combineLatest(inForeground, runningServiceTasks, runningBackgroundLocationTasks, runningWatchTasks, runningDownloadTasks) - |> map { inForeground, runningServiceTasks, runningBackgroundLocationTasks, runningWatchTasks, runningDownloadTasks -> CombinedRunningImportantTasks in - let combinedTasks = CombinedRunningImportantTasks(serviceTasks: runningServiceTasks, downloadTasks: runningDownloadTasks, backgroundLocation: runningBackgroundLocationTasks, watchTasks: runningWatchTasks) - if !inForeground && !combinedTasks.isEmpty { - return combinedTasks - } else { - return CombinedRunningImportantTasks(serviceTasks: [], downloadTasks: false, backgroundLocation: false, watchTasks: nil) - } - } - |> distinctUntilChanged - |> deliverOnMainQueue).start(next: { [weak self] value in - if let strongSelf = self { - strongSelf.runningServiceTasksValue = value - if !value.isEmpty { - //assert(strongSelf.state.currentServiceTask == nil) - var timeout: Double = 25.0 - if value.downloadTasks { - timeout = 1.6 * 60.0 - } else if value.serviceTasks.contains(.pendingMessages) { - timeout = 1.4 * 60.0 - } - strongSelf.wakeupForServiceTasks(timeout: timeout) - } else if let currentServiceTask = strongSelf.state.currentServiceTask { - strongSelf.state.currentServiceTask = nil - Logger.shared.log("WakeupManager", "ending service task #\(currentServiceTask.id)") - currentServiceTask.timer.invalidate() - strongSelf.isProcessingServiceTasksValue.set(false) - - Queue.mainQueue().after(2.0, { - UIApplication.shared.endBackgroundTask(currentServiceTask.nativeId) - }) - } - } - }) - } - - deinit { - self.inForegroundDisposable?.dispose() - self.wakeupDisposable.dispose() - } - - private func reportCompletionToSubscribersAndGetUnreadCount(account: Account, maxId: Int32, messageIds: [MessageId]) -> Signal { - var collectedSignals: [Signal] = [] - while !self.wakeupResultSubscribers.isEmpty { - let first = self.wakeupResultSubscribers[0] - if first.0 <= maxId { - self.wakeupResultSubscribers.remove(at: 0) - collectedSignals.append(first.1(messageIds)) - } - } - let accountManager = self.accountManager - return combineLatest(collectedSignals) - |> map { _ -> Void in - return Void() - } |> mapToSignal { _ -> Signal in - if !messageIds.isEmpty { - return accountManager.transaction { transaction -> InAppNotificationSettings in - return transaction.getSharedData(ApplicationSpecificSharedDataKeys.inAppNotificationSettings) as? InAppNotificationSettings ?? InAppNotificationSettings.defaultSettings - } - |> mapToSignal { inAppSettings -> Signal in - return account.postbox.transaction { transaction -> Int32? in - let (unreadCount, _) = renderedTotalUnreadCount(inAppNotificationSettings: inAppSettings, transaction: transaction) - return unreadCount - } - } - } else { - return .single(nil) - } - } - } - - private func wakeupForServiceTasks(timeout: Double = 25.0) { - assert(Queue.mainQueue().isCurrent()) - - var endTask: WakeupManagerTask? - let updatedId: Int32 = self.state.nextTaskId - self.state.nextTaskId += 1 - - let handleExpiration: (Bool) -> Void = { [weak self] byTimer in - Queue.mainQueue().async { - if let strongSelf = self { - if let currentServiceTask = strongSelf.state.currentServiceTask { - if currentServiceTask.id == updatedId { - if byTimer && strongSelf.runningServiceTasksValue.serviceTasks.contains(.pendingMessages) { - /*if #available(iOS 10.0, *) { - let content = UNMutableNotificationContent() - content.body = "Please open the app to continue sending messages" - content.sound = UNNotificationSound.default() - content.categoryIdentifier = "error" - - let request = UNNotificationRequest(identifier: "reply-error", content: content, trigger: nil) - - let center = UNUserNotificationCenter.current() - center.add(request) - }*/ - } - - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, ending service task #\(currentServiceTask.id)") - strongSelf.state.currentServiceTask = nil - currentServiceTask.timer.invalidate() - strongSelf.isProcessingServiceTasksValue.set(false) - UIApplication.shared.endBackgroundTask(currentServiceTask.nativeId) - } else { - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, current service task doesn't match") - } - } else { - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, no current service task") - } - } - } - } - - let updatedNativeId = UIApplication.shared.beginBackgroundTask(withName: "service", expirationHandler: { - handleExpiration(false) - }) - Logger.shared.log("WakeupManager", "started service task #\(updatedId)") - let updatedTimer = SwiftSignalKit.Timer(timeout: timeout, repeat: false, completion: { - handleExpiration(true) - }, queue: Queue.mainQueue()) - let updatedTask = WakeupManagerTask(nativeId: updatedNativeId, id: updatedId, timer: updatedTimer) - - if let currentServiceTask = self.state.currentServiceTask { - endTask = currentServiceTask - } - self.state.currentServiceTask = updatedTask - self.isProcessingServiceTasksValue.set(true) - - updatedTimer.start() - - if let endTask = endTask { - Logger.shared.log("WakeupManager", "ending service task #\(endTask.id) (replaced by #\(updatedTask.id))") - endTask.timer.invalidate() - UIApplication.shared.endBackgroundTask(endTask.nativeId) - } - } - - func wakeupForIncomingMessages(account: Account, timeout: Double = 25.0, completion: (([MessageId]) -> Signal)? = nil) { - assert(Queue.mainQueue().isCurrent()) - var endTask: WakeupManagerTask? - let updatedId: Int32 = self.state.nextTaskId - self.state.nextTaskId += 1 - - if let completion = completion { - self.wakeupResultSubscribers.append((updatedId, completion)) - } - - let handleExpiration: (Bool) -> Void = { [weak self] byTimer in - if let strongSelf = self { - if let currentTask = strongSelf.state.currentTask { - if currentTask.id == updatedId { - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, ending task #\(currentTask.id)") - strongSelf.state.currentTask = nil - currentTask.timer.invalidate() - strongSelf.isProcessingNotificationsValue.set(false) - let _ = strongSelf.reportCompletionToSubscribersAndGetUnreadCount(account: account, maxId: updatedId, messageIds: []).start() - UIApplication.shared.endBackgroundTask(currentTask.nativeId) - } else { - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, current task doesn't match") - } - } else { - Logger.shared.log("WakeupManager", "handleExpiration(by timer: \(byTimer)) invoked, no current task") - } - } - } - - let updatedNativeId = UIApplication.shared.beginBackgroundTask(withName: "wakeup", expirationHandler: { - handleExpiration(false) - }) - Logger.shared.log("WakeupManager", "started task #\(updatedId)") - let updatedTimer = SwiftSignalKit.Timer(timeout: timeout, repeat: false, completion: { - handleExpiration(true) - }, queue: Queue.mainQueue()) - let updatedTask = WakeupManagerTask(nativeId: updatedNativeId, id: updatedId, timer: updatedTimer) - - if let currentTask = self.state.currentTask { - endTask = currentTask - } - self.state.currentTask = updatedTask - self.isProcessingNotificationsValue.set(true) - - updatedTimer.start() - - if let endTask = endTask { - Logger.shared.log("WakeupManager", "ending task #\(endTask.id) (replaced by #\(updatedTask.id))") - endTask.timer.invalidate() - UIApplication.shared.endBackgroundTask(endTask.nativeId) - } - - self.wakeupDisposable.set((account.stateManager.pollStateUpdateCompletion() |> deliverOnMainQueue |> mapToSignal { [weak self] messageIds -> Signal in - if let strongSelf = self { - Logger.shared.log("WakeupManager", "pollStateUpdateCompletion messageIds: \(messageIds)") - return strongSelf.reportCompletionToSubscribersAndGetUnreadCount(account: account, maxId: updatedId, messageIds: messageIds) - } else { - return .complete() - } - } |> deliverOnMainQueue).start(next: { [weak self] maybeUnreadCount in - if let strongSelf = self { - if let maybeUnreadCount = maybeUnreadCount { - if UIApplication.shared.applicationIconBadgeNumber != Int(maybeUnreadCount) { - UIApplication.shared.applicationIconBadgeNumber = Int(maybeUnreadCount) - } - } - if let currentTask = strongSelf.state.currentTask { - if currentTask.id == updatedId { - Logger.shared.log("WakeupManager", "account state wakeup completed, ending task #\(currentTask.id)") - strongSelf.isProcessingNotificationsValue.set(false) - strongSelf.state.currentTask = nil - currentTask.timer.invalidate() - UIApplication.shared.endBackgroundTask(currentTask.nativeId) - } else { - Logger.shared.log("WakeupManager", "account state wakeup completed, current task doesn't match") - } - } else { - Logger.shared.log("WakeupManager", "account state wakeup completed, no current task") - } - } - })) - } -} From a26d57e18cf43866eea031010c63ad91463d414d Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 16:23:29 +0400 Subject: [PATCH 29/34] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 7 + .../Sources/PresentationStrings.swift | 7400 +++++++++-------- submodules/TelegramUI/BUCK | 1 + .../Resources/PresentationStrings.mapping | Bin 134740 -> 135076 bytes 4 files changed, 3711 insertions(+), 3697 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index dc13556de5..7d8ee18f61 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4213,6 +4213,13 @@ Unused sets are archived when you add more."; "ChatList.DeleteForCurrentUser" = "Delete just for me"; "ChatList.DeleteForEveryone" = "Delete for me and %@"; +"ChatList.DeleteForEveryoneConfirmationTitle" = "Warning!"; +"ChatList.DeleteForEveryoneConfirmationText" = "This will **delete all messages** in this chat for **both participants**."; +"ChatList.DeleteForEveryoneConfirmationAction" = "Delete All"; + +"ChatList.DeleteSavedMessagesConfirmationTitle" = "Warning!"; +"ChatList.DeleteSavedMessagesConfirmationText" = "This will **delete all messages** in this chat."; +"ChatList.DeleteSavedMessagesConfirmationAction" = "Delete All"; "ChatList.ClearChatConfirmation" = "Are you sure you want to delete all\nmessages in the chat with %@?"; diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index aa4deb30b8..92f96efa4b 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -398,4615 +398,4621 @@ public final class PresentationStrings: Equatable { public var PasscodeSettings_TurnPasscodeOn: String { return self._s[192]! } public var Channel_BanUser_Title: String { return self._s[193]! } public var WallpaperPreview_SwipeTopText: String { return self._s[194]! } - public var ArchivedChats_IntroText2: String { return self._s[195]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[196]! } - public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[197]!, self._r[197]!, [_1, _2]) - } + public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[195]! } + public var ArchivedChats_IntroText2: String { return self._s[196]! } + public var Notification_Exceptions_DeleteAll: String { return self._s[197]! } public var ChatSearch_SearchPlaceholder: String { return self._s[199]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[200]! } - public var NotificationsSound_Aurora: String { return self._s[201]! } + public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[200]!, self._r[200]!, [_1, _2]) + } + public var Passport_FieldAddressTranslationHelp: String { return self._s[201]! } + public var NotificationsSound_Aurora: String { return self._s[202]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[202]!, self._r[202]!, [_0]) + return formatWithArgumentRanges(self._s[203]!, self._r[203]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[205]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[206]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_0, _1]) + return formatWithArgumentRanges(self._s[207]!, self._r[207]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[207]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[208]! } - public var EmptyGroupInfo_Line2: String { return self._s[209]! } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[210]! } - public var Settings_FAQ_Intro: String { return self._s[213]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[215]! } - public var FeaturedStickerPacks_Title: String { return self._s[216]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[218]! } - public var Username_Title: String { return self._s[219]! } + public var Passport_PasswordNext: String { return self._s[208]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[209]! } + public var EmptyGroupInfo_Line2: String { return self._s[210]! } + public var VoiceOver_Chat_SeenByRecipients: String { return self._s[211]! } + public var Settings_FAQ_Intro: String { return self._s[214]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[216]! } + public var FeaturedStickerPacks_Title: String { return self._s[217]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[219]! } + public var Username_Title: String { return self._s[220]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[220]!, self._r[220]!, [_0]) + return formatWithArgumentRanges(self._s[221]!, self._r[221]!, [_0]) } - public var PasscodeSettings_AlphanumericCode: String { return self._s[221]! } - public var Localization_LanguageOther: String { return self._s[222]! } - public var Stickers_SuggestStickers: String { return self._s[223]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[222]! } + public var Localization_LanguageOther: String { return self._s[223]! } + public var Stickers_SuggestStickers: String { return self._s[224]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[224]!, self._r[224]!, [_0]) + return formatWithArgumentRanges(self._s[225]!, self._r[225]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[225]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[226]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[227]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[226]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[227]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[228]! } public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[228]!, self._r[228]!, [_0]) + return formatWithArgumentRanges(self._s[229]!, self._r[229]!, [_0]) } - public var Wallet_TransactionInfo_CopyAddress: String { return self._s[230]! } - public var Group_UpgradeConfirmation: String { return self._s[231]! } - public var DialogList_Unpin: String { return self._s[232]! } - public var Passport_Identity_DateOfBirth: String { return self._s[233]! } - public var Month_ShortOctober: String { return self._s[234]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[235]! } - public var Notification_CallCanceledShort: String { return self._s[236]! } - public var Passport_Phone_Help: String { return self._s[237]! } - public var Passport_Language_az: String { return self._s[239]! } - public var CreatePoll_TextPlaceholder: String { return self._s[241]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[242]! } - public var Passport_Identity_DocumentNumber: String { return self._s[243]! } - public var PhotoEditor_CurvesRed: String { return self._s[244]! } - public var PhoneNumberHelp_Alert: String { return self._s[246]! } - public var SocksProxySetup_Port: String { return self._s[247]! } - public var Checkout_PayNone: String { return self._s[248]! } - public var AutoDownloadSettings_WiFi: String { return self._s[249]! } - public var GroupInfo_GroupType: String { return self._s[250]! } - public var StickerSettings_ContextHide: String { return self._s[251]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[252]! } - public var Group_Setup_HistoryTitle: String { return self._s[254]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[255]! } - public var PasscodeSettings_AutoLock: String { return self._s[256]! } - public var Passport_Title: String { return self._s[257]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[258]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[259]! } - public var GroupPermission_NoSendGifs: String { return self._s[260]! } - public var PrivacySettings_PasscodeOn: String { return self._s[261]! } + public var Wallet_TransactionInfo_CopyAddress: String { return self._s[231]! } + public var Group_UpgradeConfirmation: String { return self._s[232]! } + public var DialogList_Unpin: String { return self._s[233]! } + public var Passport_Identity_DateOfBirth: String { return self._s[234]! } + public var Month_ShortOctober: String { return self._s[235]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[236]! } + public var Notification_CallCanceledShort: String { return self._s[237]! } + public var Passport_Phone_Help: String { return self._s[238]! } + public var Passport_Language_az: String { return self._s[240]! } + public var CreatePoll_TextPlaceholder: String { return self._s[242]! } + public var VoiceOver_Chat_AnonymousPoll: String { return self._s[243]! } + public var Passport_Identity_DocumentNumber: String { return self._s[244]! } + public var PhotoEditor_CurvesRed: String { return self._s[245]! } + public var PhoneNumberHelp_Alert: String { return self._s[247]! } + public var SocksProxySetup_Port: String { return self._s[248]! } + public var Checkout_PayNone: String { return self._s[249]! } + public var AutoDownloadSettings_WiFi: String { return self._s[250]! } + public var GroupInfo_GroupType: String { return self._s[251]! } + public var StickerSettings_ContextHide: String { return self._s[252]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[253]! } + public var Group_Setup_HistoryTitle: String { return self._s[255]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[256]! } + public var PasscodeSettings_AutoLock: String { return self._s[257]! } + public var Passport_Title: String { return self._s[258]! } + public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[259]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[260]! } + public var GroupPermission_NoSendGifs: String { return self._s[261]! } + public var PrivacySettings_PasscodeOn: String { return self._s[262]! } public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[262]!, self._r[262]!, [_0]) + return formatWithArgumentRanges(self._s[263]!, self._r[263]!, [_0]) } - public var State_WaitingForNetwork: String { return self._s[264]! } + public var State_WaitingForNetwork: String { return self._s[265]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[265]!, self._r[265]!, [_0, _1]) + return formatWithArgumentRanges(self._s[266]!, self._r[266]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[267]! } + public var Calls_NotNow: String { return self._s[268]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[268]!, self._r[268]!, [_0]) + return formatWithArgumentRanges(self._s[269]!, self._r[269]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[269]! } - public var TwoStepAuth_PasswordSet: String { return self._s[270]! } - public var Passport_DeleteDocument: String { return self._s[271]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[272]! } + public var UserInfo_SendMessage: String { return self._s[270]! } + public var TwoStepAuth_PasswordSet: String { return self._s[271]! } + public var Passport_DeleteDocument: String { return self._s[272]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[273]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[273]!, self._r[273]!, [_1]) + return formatWithArgumentRanges(self._s[274]!, self._r[274]!, [_1]) } - public var GroupRemoved_Remove: String { return self._s[274]! } - public var Passport_FieldIdentity: String { return self._s[275]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[276]! } - public var Conversation_Processing: String { return self._s[279]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[281]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[284]! } - public var Month_GenFebruary: String { return self._s[285]! } - public var Wallet_Send_NetworkErrorTitle: String { return self._s[286]! } + public var GroupRemoved_Remove: String { return self._s[275]! } + public var Passport_FieldIdentity: String { return self._s[276]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[277]! } + public var Conversation_Processing: String { return self._s[280]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[282]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[285]! } + public var Month_GenFebruary: String { return self._s[286]! } + public var Wallet_Send_NetworkErrorTitle: String { return self._s[287]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[288]!, self._r[288]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[289]!, self._r[289]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[289]! } - public var Wallet_Month_ShortJune: String { return self._s[291]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[292]! } - public var GroupInfo_AddParticipant: String { return self._s[293]! } - public var KeyCommand_SendMessage: String { return self._s[294]! } - public var VoiceOver_Chat_YourContact: String { return self._s[296]! } - public var Map_LiveLocationShowAll: String { return self._s[297]! } - public var WallpaperSearch_ColorOrange: String { return self._s[299]! } - public var Appearance_AppIconDefaultX: String { return self._s[300]! } - public var Checkout_Receipt_Title: String { return self._s[301]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[302]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[303]! } - public var Message_Contact: String { return self._s[304]! } - public var Call_StatusIncoming: String { return self._s[305]! } - public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[306]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[290]! } + public var Wallet_Month_ShortJune: String { return self._s[292]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[293]! } + public var GroupInfo_AddParticipant: String { return self._s[294]! } + public var KeyCommand_SendMessage: String { return self._s[295]! } + public var VoiceOver_Chat_YourContact: String { return self._s[297]! } + public var Map_LiveLocationShowAll: String { return self._s[298]! } + public var WallpaperSearch_ColorOrange: String { return self._s[300]! } + public var Appearance_AppIconDefaultX: String { return self._s[301]! } + public var Checkout_Receipt_Title: String { return self._s[302]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[303]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[304]! } + public var Message_Contact: String { return self._s[305]! } + public var Call_StatusIncoming: String { return self._s[306]! } + public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[307]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[307]!, self._r[307]!, [_1]) + return formatWithArgumentRanges(self._s[308]!, self._r[308]!, [_1]) } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[309]!, self._r[309]!, [_1]) + return formatWithArgumentRanges(self._s[310]!, self._r[310]!, [_1]) } - public var VoiceOver_Media_PlaybackRate: String { return self._s[310]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[311]! } - public var Conversation_ViewChannel: String { return self._s[312]! } + public var VoiceOver_Media_PlaybackRate: String { return self._s[311]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[312]! } + public var Conversation_ViewChannel: String { return self._s[313]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[313]!, self._r[313]!, [_0]) + return formatWithArgumentRanges(self._s[314]!, self._r[314]!, [_0]) } - public var Passport_Language_nl: String { return self._s[315]! } - public var Camera_Retake: String { return self._s[316]! } + public var Passport_Language_nl: String { return self._s[316]! } + public var Camera_Retake: String { return self._s[317]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[317]!, self._r[317]!, [_0]) + return formatWithArgumentRanges(self._s[318]!, self._r[318]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[318]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[319]! } - public var Tour_Title6: String { return self._s[320]! } - public var Map_ChooseAPlace: String { return self._s[321]! } - public var CallSettings_Never: String { return self._s[323]! } + public var AuthSessions_LogOutApplications: String { return self._s[319]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[320]! } + public var Tour_Title6: String { return self._s[321]! } + public var Map_ChooseAPlace: String { return self._s[322]! } + public var CallSettings_Never: String { return self._s[324]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[324]!, self._r[324]!, [_0]) + return formatWithArgumentRanges(self._s[325]!, self._r[325]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[325]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[326]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[326]!, self._r[326]!, [_0]) + return formatWithArgumentRanges(self._s[327]!, self._r[327]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[327]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[328]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[328]!, self._r[328]!, [_0]) + return formatWithArgumentRanges(self._s[329]!, self._r[329]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[329]! } + public var GroupInfo_InviteLink_Title: String { return self._s[330]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[330]!, self._r[330]!, [_1, _2]) + return formatWithArgumentRanges(self._s[331]!, self._r[331]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[331]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[332]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[333]! } + public var KeyCommand_ScrollUp: String { return self._s[332]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[333]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[334]! } public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_0]) - } - public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[335]!, self._r[335]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[336]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[337]! } - public var ContactList_Context_SendMessage: String { return self._s[339]! } - public var Weekday_Tuesday: String { return self._s[340]! } - public var Wallet_Created_Title: String { return self._s[342]! } - public var ScheduledMessages_Delete: String { return self._s[343]! } - public var UserInfo_StartSecretChat: String { return self._s[344]! } - public var Passport_Identity_FilesTitle: String { return self._s[345]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[346]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[348]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[349]! } - public var AuthSessions_Sessions: String { return self._s[350]! } + public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[336]!, self._r[336]!, [_0]) + } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[337]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[338]! } + public var ContactList_Context_SendMessage: String { return self._s[340]! } + public var Weekday_Tuesday: String { return self._s[341]! } + public var Wallet_Created_Title: String { return self._s[343]! } + public var ScheduledMessages_Delete: String { return self._s[344]! } + public var UserInfo_StartSecretChat: String { return self._s[345]! } + public var Passport_Identity_FilesTitle: String { return self._s[346]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[347]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[349]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[350]! } + public var AuthSessions_Sessions: String { return self._s[351]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0]) + return formatWithArgumentRanges(self._s[353]!, self._r[353]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[353]! } - public var Call_StatusWaiting: String { return self._s[354]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[355]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[356]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[357]! } - public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[358]! } - public var LogoutOptions_AddAccountText: String { return self._s[359]! } - public var PasscodeSettings_6DigitCode: String { return self._s[360]! } - public var Settings_LogoutConfirmationText: String { return self._s[361]! } - public var Passport_Identity_TypePassport: String { return self._s[363]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[354]! } + public var Call_StatusWaiting: String { return self._s[355]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[356]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[357]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[358]! } + public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[359]! } + public var LogoutOptions_AddAccountText: String { return self._s[360]! } + public var PasscodeSettings_6DigitCode: String { return self._s[361]! } + public var Settings_LogoutConfirmationText: String { return self._s[362]! } + public var Passport_Identity_TypePassport: String { return self._s[364]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[366]!, self._r[366]!, [_1, _2]) + return formatWithArgumentRanges(self._s[367]!, self._r[367]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[367]! } - public var AccessDenied_SaveMedia: String { return self._s[368]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[370]! } - public var Settings_Title: String { return self._s[372]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[373]! } - public var Contacts_InviteSearchLabel: String { return self._s[375]! } - public var ConvertToSupergroup_Title: String { return self._s[376]! } + public var SocksProxySetup_SaveProxy: String { return self._s[368]! } + public var AccessDenied_SaveMedia: String { return self._s[369]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[371]! } + public var Settings_Title: String { return self._s[373]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[374]! } + public var Contacts_InviteSearchLabel: String { return self._s[376]! } + public var ConvertToSupergroup_Title: String { return self._s[377]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_0]) + return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_0]) } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[378]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[379]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[380]! } - public var UserInfo_BotHelp: String { return self._s[381]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[382]! } - public var Checkout_Name: String { return self._s[383]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[384]! } - public var Channel_BanUser_BlockFor: String { return self._s[385]! } - public var Checkout_ShippingAddress: String { return self._s[386]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[387]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[388]! } - public var Privacy_Forwards: String { return self._s[389]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[390]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[391]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[381]! } + public var UserInfo_BotHelp: String { return self._s[382]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[383]! } + public var Checkout_Name: String { return self._s[384]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[385]! } + public var Channel_BanUser_BlockFor: String { return self._s[386]! } + public var Checkout_ShippingAddress: String { return self._s[387]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[388]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[389]! } + public var Privacy_Forwards: String { return self._s[390]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[391]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[392]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[394]!, self._r[394]!, [_0]) + return formatWithArgumentRanges(self._s[395]!, self._r[395]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[395]! } - public var Group_OwnershipTransfer_Title: String { return self._s[396]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[397]! } - public var Group_LeaveGroup: String { return self._s[398]! } - public var Settings_UsernameEmpty: String { return self._s[399]! } + public var Contacts_SortedByName: String { return self._s[396]! } + public var Group_OwnershipTransfer_Title: String { return self._s[397]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[398]! } + public var Group_LeaveGroup: String { return self._s[399]! } + public var Settings_UsernameEmpty: String { return self._s[400]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[400]!, self._r[400]!, [_0]) + return formatWithArgumentRanges(self._s[401]!, self._r[401]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[401]!, self._r[401]!, [_1]) + return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_1, _2]) + return formatWithArgumentRanges(self._s[403]!, self._r[403]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[403]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[405]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[406]! } - public var UserInfo_AddToExisting: String { return self._s[407]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[408]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[409]! } + public var Message_ImageExpired: String { return self._s[404]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[406]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[407]! } + public var UserInfo_AddToExisting: String { return self._s[408]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[409]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[410]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[410]!, self._r[410]!, [_1]) + return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[411]! } - public var Passport_Language_km: String { return self._s[412]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[414]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[415]! } - public var Notification_CallMissedShort: String { return self._s[416]! } - public var Wallet_Info_YourBalance: String { return self._s[417]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[418]! } - public var Watch_Compose_Send: String { return self._s[419]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[422]! } - public var Conversation_HoldForVideo: String { return self._s[423]! } - public var Wallet_TransactionInfo_CommentHeader: String { return self._s[424]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[426]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[428]! } - public var Channel_LinkItem: String { return self._s[429]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[412]! } + public var Passport_Language_km: String { return self._s[413]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[415]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[416]! } + public var Notification_CallMissedShort: String { return self._s[417]! } + public var Wallet_Info_YourBalance: String { return self._s[418]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[419]! } + public var Watch_Compose_Send: String { return self._s[420]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[423]! } + public var Conversation_HoldForVideo: String { return self._s[424]! } + public var Wallet_TransactionInfo_CommentHeader: String { return self._s[425]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[427]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[429]! } + public var Channel_LinkItem: String { return self._s[430]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[430]!, self._r[430]!, [_0, _1]) + return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[433]!, self._r[433]!, [_0]) + return formatWithArgumentRanges(self._s[434]!, self._r[434]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[434]! } - public var Passport_Language_dv: String { return self._s[435]! } - public var Undo_LeftChannel: String { return self._s[436]! } - public var Notifications_ExceptionsMuted: String { return self._s[437]! } - public var ChatList_UnhideAction: String { return self._s[438]! } - public var Conversation_ContextMenuShare: String { return self._s[439]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[440]! } - public var ShareFileTip_Title: String { return self._s[441]! } - public var NotificationsSound_Chord: String { return self._s[442]! } - public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[443]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[435]! } + public var Passport_Language_dv: String { return self._s[436]! } + public var Undo_LeftChannel: String { return self._s[437]! } + public var Notifications_ExceptionsMuted: String { return self._s[438]! } + public var ChatList_UnhideAction: String { return self._s[439]! } + public var Conversation_ContextMenuShare: String { return self._s[440]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[441]! } + public var ShareFileTip_Title: String { return self._s[442]! } + public var NotificationsSound_Chord: String { return self._s[443]! } + public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[444]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_1, _2]) + return formatWithArgumentRanges(self._s[445]!, self._r[445]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[445]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[446]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[446]!, self._r[446]!, [_0]) + return formatWithArgumentRanges(self._s[447]!, self._r[447]!, [_0]) } public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[447]!, self._r[447]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_1, _2, _3]) } - public var Wallpaper_ErrorNotFound: String { return self._s[448]! } - public var Notification_CallOutgoingShort: String { return self._s[450]! } - public var Wallet_WordImport_IncorrectText: String { return self._s[451]! } + public var Wallpaper_ErrorNotFound: String { return self._s[449]! } + public var Notification_CallOutgoingShort: String { return self._s[451]! } + public var Wallet_WordImport_IncorrectText: String { return self._s[452]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[452]!, self._r[452]!, [_1, _2]) + return formatWithArgumentRanges(self._s[453]!, self._r[453]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[453]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[454]! } - public var ReportPeer_Report: String { return self._s[455]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[456]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[457]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[454]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[455]! } + public var ReportPeer_Report: String { return self._s[456]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[457]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[458]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[458]!, self._r[458]!, [_1, _2]) + return formatWithArgumentRanges(self._s[459]!, self._r[459]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[459]! } - public var Login_CodeSentInternal: String { return self._s[460]! } - public var Wallet_Month_GenJanuary: String { return self._s[461]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[462]! } + public var StickerPack_Send: String { return self._s[460]! } + public var Login_CodeSentInternal: String { return self._s[461]! } + public var Wallet_Month_GenJanuary: String { return self._s[462]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[463]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[463]!, self._r[463]!, [_0]) + return formatWithArgumentRanges(self._s[464]!, self._r[464]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[465]!, self._r[465]!, [_0]) + return formatWithArgumentRanges(self._s[466]!, self._r[466]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[466]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[467]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[467]!, self._r[467]!, [_1]) + return formatWithArgumentRanges(self._s[468]!, self._r[468]!, [_1]) } - public var ReportPeer_ReasonViolence: String { return self._s[469]! } - public var Map_Locating: String { return self._s[470]! } + public var ReportPeer_ReasonViolence: String { return self._s[470]! } + public var Map_Locating: String { return self._s[471]! } public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0]) + return formatWithArgumentRanges(self._s[472]!, self._r[472]!, [_0]) } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[472]!, self._r[472]!, [_1]) + return formatWithArgumentRanges(self._s[473]!, self._r[473]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[474]! } - public var CheckoutInfo_SaveInfo: String { return self._s[475]! } - public var SharedMedia_EmptyLinksText: String { return self._s[477]! } - public var Passport_Address_CityPlaceholder: String { return self._s[478]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[479]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[480]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[482]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[475]! } + public var CheckoutInfo_SaveInfo: String { return self._s[476]! } + public var SharedMedia_EmptyLinksText: String { return self._s[478]! } + public var Passport_Address_CityPlaceholder: String { return self._s[479]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[480]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[481]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[483]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[483]!, self._r[483]!, [_1]) + return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_0]) + return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[485]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[486]! } - public var ChangePhoneNumberCode_Code: String { return self._s[487]! } - public var Appearance_CreateTheme: String { return self._s[488]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[486]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[487]! } + public var ChangePhoneNumberCode_Code: String { return self._s[488]! } + public var Appearance_CreateTheme: String { return self._s[489]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_0]) + return formatWithArgumentRanges(self._s[490]!, self._r[490]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[490]! } - public var HashtagSearch_AllChats: String { return self._s[491]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[493]! } + public var TwoStepAuth_SetupEmail: String { return self._s[491]! } + public var HashtagSearch_AllChats: String { return self._s[492]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[494]! } public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[494]!, self._r[494]!, [_0]) + return formatWithArgumentRanges(self._s[495]!, self._r[495]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[496]! } + public var PhotoEditor_QualityHigh: String { return self._s[497]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[497]!, self._r[497]!, [_0]) + return formatWithArgumentRanges(self._s[498]!, self._r[498]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[498]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[499]! } - public var Message_LiveLocation: String { return self._s[500]! } - public var Cache_LowDiskSpaceText: String { return self._s[501]! } - public var Wallet_Receive_ShareAddress: String { return self._s[502]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[503]! } - public var Conversation_SendMessage: String { return self._s[504]! } - public var AuthSessions_EmptyTitle: String { return self._s[505]! } - public var Privacy_PhoneNumber: String { return self._s[506]! } - public var PeopleNearby_CreateGroup: String { return self._s[507]! } - public var CallSettings_UseLessData: String { return self._s[508]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[509]! } - public var Stickers_AddToFavorites: String { return self._s[510]! } - public var Wallet_WordImport_Title: String { return self._s[511]! } - public var PhotoEditor_QualityLow: String { return self._s[512]! } - public var Watch_UserInfo_Unblock: String { return self._s[513]! } - public var Settings_Logout: String { return self._s[514]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[499]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[500]! } + public var Message_LiveLocation: String { return self._s[501]! } + public var Cache_LowDiskSpaceText: String { return self._s[502]! } + public var Wallet_Receive_ShareAddress: String { return self._s[503]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[504]! } + public var Conversation_SendMessage: String { return self._s[505]! } + public var AuthSessions_EmptyTitle: String { return self._s[506]! } + public var Privacy_PhoneNumber: String { return self._s[507]! } + public var PeopleNearby_CreateGroup: String { return self._s[508]! } + public var CallSettings_UseLessData: String { return self._s[509]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[510]! } + public var Stickers_AddToFavorites: String { return self._s[511]! } + public var Wallet_WordImport_Title: String { return self._s[512]! } + public var PhotoEditor_QualityLow: String { return self._s[513]! } + public var Watch_UserInfo_Unblock: String { return self._s[514]! } + public var Settings_Logout: String { return self._s[515]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_1]) + return formatWithArgumentRanges(self._s[516]!, self._r[516]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[516]! } - public var ChannelInfo_Stats: String { return self._s[517]! } - public var TextFormat_Link: String { return self._s[518]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[517]! } + public var ChannelInfo_Stats: String { return self._s[518]! } + public var TextFormat_Link: String { return self._s[519]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[519]!, self._r[519]!, [_1, _2]) + return formatWithArgumentRanges(self._s[520]!, self._r[520]!, [_1, _2]) } - public var Wallet_TransactionInfo_Title: String { return self._s[520]! } + public var Wallet_TransactionInfo_Title: String { return self._s[521]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[521]!, self._r[521]!, [_0]) + return formatWithArgumentRanges(self._s[522]!, self._r[522]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[522]! } - public var Group_Setup_TypePublicHelp: String { return self._s[523]! } - public var Passport_Scans_UploadNew: String { return self._s[524]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[525]! } - public var DialogList_Title: String { return self._s[528]! } - public var NotificationSettings_ContactJoined: String { return self._s[529]! } - public var GroupInfo_LabelAdmin: String { return self._s[530]! } - public var KeyCommand_ChatInfo: String { return self._s[531]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[532]! } - public var Call_ReportIncludeLog: String { return self._s[533]! } + public var Watch_Notification_Joined: String { return self._s[523]! } + public var Group_Setup_TypePublicHelp: String { return self._s[524]! } + public var Passport_Scans_UploadNew: String { return self._s[525]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[526]! } + public var DialogList_Title: String { return self._s[529]! } + public var NotificationSettings_ContactJoined: String { return self._s[530]! } + public var GroupInfo_LabelAdmin: String { return self._s[531]! } + public var KeyCommand_ChatInfo: String { return self._s[532]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[533]! } + public var Call_ReportIncludeLog: String { return self._s[534]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[536]!, self._r[536]!, [_0]) + return formatWithArgumentRanges(self._s[537]!, self._r[537]!, [_0]) } - public var LocalGroup_IrrelevantWarning: String { return self._s[537]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[538]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[539]! } - public var Message_Sticker: String { return self._s[540]! } - public var LastSeen_JustNow: String { return self._s[542]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[544]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[545]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[546]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[547]! } - public var TwoStepAuth_Email: String { return self._s[548]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[549]! } - public var PhotoEditor_BlurToolOff: String { return self._s[550]! } - public var Message_PinnedStickerMessage: String { return self._s[551]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[552]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[553]! } - public var Passport_DiscardMessageTitle: String { return self._s[554]! } - public var Privacy_PaymentsTitle: String { return self._s[555]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[556]! } - public var Channel_DiscussionGroup_Header: String { return self._s[558]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[559]! } - public var Appearance_ColorTheme: String { return self._s[560]! } - public var UserInfo_ShareContact: String { return self._s[561]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[562]! } - public var Common_More: String { return self._s[563]! } - public var Watch_Message_Call: String { return self._s[564]! } - public var Profile_EncryptionKey: String { return self._s[567]! } - public var Privacy_TopPeers: String { return self._s[568]! } - public var Conversation_StopPollConfirmation: String { return self._s[569]! } - public var Wallet_Words_NotDoneText: String { return self._s[571]! } - public var Privacy_TopPeersWarning: String { return self._s[573]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[574]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[575]! } - public var Wallet_RestoreFailed_EnterWords: String { return self._s[578]! } - public var DialogList_SearchSectionMessages: String { return self._s[579]! } - public var Notifications_ChannelNotifications: String { return self._s[580]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[581]! } - public var Passport_Language_sk: String { return self._s[582]! } - public var Notification_MessageLifetime1h: String { return self._s[583]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[584]! } - public var Call_ReportSkip: String { return self._s[586]! } - public var Cache_ServiceFiles: String { return self._s[587]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[588]! } - public var VoiceOver_Chat_YourFile: String { return self._s[589]! } - public var Map_Hybrid: String { return self._s[590]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[592]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[594]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[595]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[596]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[599]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[538]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[539]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[540]! } + public var Message_Sticker: String { return self._s[541]! } + public var LastSeen_JustNow: String { return self._s[543]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[545]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[546]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[547]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[548]! } + public var TwoStepAuth_Email: String { return self._s[549]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[550]! } + public var PhotoEditor_BlurToolOff: String { return self._s[551]! } + public var Message_PinnedStickerMessage: String { return self._s[552]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[553]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[554]! } + public var Passport_DiscardMessageTitle: String { return self._s[555]! } + public var Privacy_PaymentsTitle: String { return self._s[556]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[557]! } + public var Channel_DiscussionGroup_Header: String { return self._s[559]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[560]! } + public var Appearance_ColorTheme: String { return self._s[561]! } + public var UserInfo_ShareContact: String { return self._s[562]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[563]! } + public var Common_More: String { return self._s[564]! } + public var Watch_Message_Call: String { return self._s[565]! } + public var Profile_EncryptionKey: String { return self._s[568]! } + public var Privacy_TopPeers: String { return self._s[569]! } + public var Conversation_StopPollConfirmation: String { return self._s[570]! } + public var Wallet_Words_NotDoneText: String { return self._s[572]! } + public var Privacy_TopPeersWarning: String { return self._s[574]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[575]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[576]! } + public var Wallet_RestoreFailed_EnterWords: String { return self._s[579]! } + public var DialogList_SearchSectionMessages: String { return self._s[580]! } + public var Notifications_ChannelNotifications: String { return self._s[581]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[582]! } + public var Passport_Language_sk: String { return self._s[583]! } + public var Notification_MessageLifetime1h: String { return self._s[584]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[585]! } + public var Call_ReportSkip: String { return self._s[587]! } + public var Cache_ServiceFiles: String { return self._s[588]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[589]! } + public var VoiceOver_Chat_YourFile: String { return self._s[590]! } + public var Map_Hybrid: String { return self._s[591]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[593]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[595]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[596]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[597]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[600]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[600]!, self._r[600]!, [_1]) + return formatWithArgumentRanges(self._s[601]!, self._r[601]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[602]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[603]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[603]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[604]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[604]!, self._r[604]!, [_1, _2]) + return formatWithArgumentRanges(self._s[605]!, self._r[605]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[605]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[606]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[607]! } - public var UserInfo_ShareBot: String { return self._s[610]! } + public var Conversation_LiveLocationYou: String { return self._s[606]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[607]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[608]! } + public var UserInfo_ShareBot: String { return self._s[611]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[611]!, self._r[611]!, [_1, _2]) + return formatWithArgumentRanges(self._s[612]!, self._r[612]!, [_1, _2]) } - public var PhotoEditor_ShadowsTint: String { return self._s[612]! } - public var Message_Audio: String { return self._s[613]! } - public var Passport_Language_lt: String { return self._s[614]! } + public var PhotoEditor_ShadowsTint: String { return self._s[613]! } + public var Message_Audio: String { return self._s[614]! } + public var Passport_Language_lt: String { return self._s[615]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[615]!, self._r[615]!, [_0]) + return formatWithArgumentRanges(self._s[616]!, self._r[616]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[616]! } - public var Conversation_FileICloudDrive: String { return self._s[617]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[618]! } + public var Permissions_SiriText_v0: String { return self._s[617]! } + public var Conversation_FileICloudDrive: String { return self._s[618]! } + public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[619]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[620]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[619]!, self._r[619]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[621]!, self._r[621]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[620]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[622]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[621]!, self._r[621]!, [_0]) + return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_0]) } - public var Channel_SignMessages: String { return self._s[622]! } + public var Channel_SignMessages: String { return self._s[624]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_1]) + return formatWithArgumentRanges(self._s[625]!, self._r[625]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[624]! } - public var Passport_ScanPassport: String { return self._s[625]! } - public var Watch_Suggestion_Thanks: String { return self._s[626]! } - public var BlockedUsers_AddNew: String { return self._s[627]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[626]! } + public var Passport_ScanPassport: String { return self._s[627]! } + public var Watch_Suggestion_Thanks: String { return self._s[628]! } + public var BlockedUsers_AddNew: String { return self._s[629]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[628]!, self._r[628]!, [_1, _2]) + return formatWithArgumentRanges(self._s[630]!, self._r[630]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[629]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[630]! } - public var Month_GenJuly: String { return self._s[631]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[632]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[634]! } - public var Notification_ChannelInviterSelf: String { return self._s[635]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[636]! } + public var Watch_Message_Invoice: String { return self._s[631]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[632]! } + public var Month_GenJuly: String { return self._s[633]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[634]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[636]! } + public var Notification_ChannelInviterSelf: String { return self._s[637]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[638]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[637]!, self._r[637]!, [_1, _2]) + return formatWithArgumentRanges(self._s[639]!, self._r[639]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[638]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[639]! } + public var CheckoutInfo_Title: String { return self._s[640]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[641]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_0]) + return formatWithArgumentRanges(self._s[642]!, self._r[642]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[641]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[642]! } - public var Passport_Language_de: String { return self._s[643]! } - public var Update_Title: String { return self._s[644]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[645]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[646]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[647]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[648]! } - public var NotificationsSound_Telegraph: String { return self._s[649]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[650]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[651]! } + public var Passport_Identity_MainPage: String { return self._s[643]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[644]! } + public var Passport_Language_de: String { return self._s[645]! } + public var Update_Title: String { return self._s[646]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[647]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[648]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[649]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[650]! } + public var NotificationsSound_Telegraph: String { return self._s[651]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[652]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[653]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_0]) + return formatWithArgumentRanges(self._s[654]!, self._r[654]!, [_0]) } - public var Stickers_SuggestAll: String { return self._s[653]! } - public var Conversation_ForwardTitle: String { return self._s[654]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[655]! } + public var Stickers_SuggestAll: String { return self._s[655]! } + public var Conversation_ForwardTitle: String { return self._s[656]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[657]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[656]!, self._r[656]!, [_0]) + return formatWithArgumentRanges(self._s[658]!, self._r[658]!, [_0]) } - public var Calls_NewCall: String { return self._s[657]! } - public var Call_StatusEnded: String { return self._s[658]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[659]! } - public var Settings_ProxyConnected: String { return self._s[660]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[661]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[662]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[663]! } - public var Passport_PasswordPlaceholder: String { return self._s[664]! } - public var Message_PinnedInvoice: String { return self._s[665]! } - public var Passport_Identity_IssueDate: String { return self._s[666]! } - public var Passport_Language_pl: String { return self._s[667]! } + public var Calls_NewCall: String { return self._s[659]! } + public var Call_StatusEnded: String { return self._s[660]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[661]! } + public var Settings_ProxyConnected: String { return self._s[662]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[663]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[664]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[665]! } + public var Passport_PasswordPlaceholder: String { return self._s[666]! } + public var Message_PinnedInvoice: String { return self._s[667]! } + public var Passport_Identity_IssueDate: String { return self._s[668]! } + public var Passport_Language_pl: String { return self._s[669]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[668]!, self._r[668]!, [_0]) + return formatWithArgumentRanges(self._s[670]!, self._r[670]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[669]! } - public var Call_StatusConnecting: String { return self._s[670]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[671]! } + public var Call_StatusConnecting: String { return self._s[672]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0]) + return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[673]! } - public var Common_Edit: String { return self._s[674]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[675]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[675]! } + public var Common_Edit: String { return self._s[676]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[677]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[676]!, self._r[676]!, [_0]) + return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[677]! } - public var PrivateDataSettings_Title: String { return self._s[678]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[679]! } - public var ChatList_Read: String { return self._s[680]! } - public var Wallet_WordImport_Text: String { return self._s[681]! } - public var Undo_ChatClearedForBothSides: String { return self._s[682]! } - public var GroupPermission_SectionTitle: String { return self._s[683]! } + public var GroupInfo_ChatAdmins: String { return self._s[679]! } + public var PrivateDataSettings_Title: String { return self._s[680]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[681]! } + public var ChatList_Read: String { return self._s[682]! } + public var Wallet_WordImport_Text: String { return self._s[683]! } + public var Undo_ChatClearedForBothSides: String { return self._s[684]! } + public var GroupPermission_SectionTitle: String { return self._s[685]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[685]!, self._r[685]!, [_1, _2]) + return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[686]! } - public var Update_UpdateApp: String { return self._s[687]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[688]! } - public var Settings_Appearance: String { return self._s[689]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[693]! } - public var Watch_Location_Access: String { return self._s[694]! } - public var ShareMenu_CopyShareLink: String { return self._s[696]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[697]! } - public var Conversation_Theme: String { return self._s[699]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[688]! } + public var Update_UpdateApp: String { return self._s[689]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[690]! } + public var Settings_Appearance: String { return self._s[691]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[695]! } + public var Watch_Location_Access: String { return self._s[696]! } + public var ShareMenu_CopyShareLink: String { return self._s[698]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[699]! } + public var Conversation_Theme: String { return self._s[701]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[700]!, self._r[700]!, [_0]) + return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[701]! } - public var Weekday_ShortWednesday: String { return self._s[702]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[703]! } - public var Undo_LeftGroup: String { return self._s[706]! } - public var Wallet_RestoreFailed_Text: String { return self._s[707]! } - public var Conversation_LinkDialogCopy: String { return self._s[708]! } - public var Wallet_TransactionInfo_NoAddress: String { return self._s[710]! } - public var Wallet_Navigation_Back: String { return self._s[711]! } - public var KeyCommand_FocusOnInputField: String { return self._s[712]! } - public var Contacts_SelectAll: String { return self._s[713]! } - public var Preview_SaveToCameraRoll: String { return self._s[714]! } - public var PrivacySettings_PasscodeOff: String { return self._s[715]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[716]! } - public var Wallpaper_Title: String { return self._s[717]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[718]! } - public var AccessDenied_Camera: String { return self._s[719]! } - public var Watch_Compose_CurrentLocation: String { return self._s[720]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[722]! } + public var Notifications_ClassicTones: String { return self._s[703]! } + public var Weekday_ShortWednesday: String { return self._s[704]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[705]! } + public var Undo_LeftGroup: String { return self._s[708]! } + public var Wallet_RestoreFailed_Text: String { return self._s[709]! } + public var Conversation_LinkDialogCopy: String { return self._s[710]! } + public var Wallet_TransactionInfo_NoAddress: String { return self._s[712]! } + public var Wallet_Navigation_Back: String { return self._s[713]! } + public var KeyCommand_FocusOnInputField: String { return self._s[714]! } + public var Contacts_SelectAll: String { return self._s[715]! } + public var Preview_SaveToCameraRoll: String { return self._s[716]! } + public var PrivacySettings_PasscodeOff: String { return self._s[717]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[718]! } + public var Wallpaper_Title: String { return self._s[719]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[720]! } + public var AccessDenied_Camera: String { return self._s[721]! } + public var Watch_Compose_CurrentLocation: String { return self._s[722]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[724]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[723]!, self._r[723]!, [_0]) + return formatWithArgumentRanges(self._s[725]!, self._r[725]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[724]! } - public var Passport_Language_ro: String { return self._s[725]! } - public var EditTheme_UploadNewTheme: String { return self._s[726]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[727]! } - public var Wallet_Intro_Terms: String { return self._s[728]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[726]! } + public var Passport_Language_ro: String { return self._s[727]! } + public var EditTheme_UploadNewTheme: String { return self._s[728]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[729]! } + public var Wallet_Intro_Terms: String { return self._s[730]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[729]!, self._r[729]!, [_0]) + return formatWithArgumentRanges(self._s[731]!, self._r[731]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[730]! } - public var State_ConnectingToProxy: String { return self._s[731]! } - public var Calls_RatingTitle: String { return self._s[732]! } - public var Generic_ErrorMoreInfo: String { return self._s[733]! } - public var Appearance_PreviewReplyText: String { return self._s[734]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[735]! } + public var Login_CancelPhoneVerification: String { return self._s[732]! } + public var State_ConnectingToProxy: String { return self._s[733]! } + public var Calls_RatingTitle: String { return self._s[734]! } + public var Generic_ErrorMoreInfo: String { return self._s[735]! } + public var Appearance_PreviewReplyText: String { return self._s[736]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[737]! } public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[736]!, self._r[736]!, [_0]) + return formatWithArgumentRanges(self._s[738]!, self._r[738]!, [_0]) } - public var SharedMedia_CategoryLinks: String { return self._s[737]! } - public var Calls_Missed: String { return self._s[738]! } - public var Cache_Photos: String { return self._s[742]! } - public var GroupPermission_NoAddMembers: String { return self._s[743]! } - public var ScheduledMessages_Title: String { return self._s[744]! } + public var SharedMedia_CategoryLinks: String { return self._s[739]! } + public var Calls_Missed: String { return self._s[740]! } + public var Cache_Photos: String { return self._s[744]! } + public var GroupPermission_NoAddMembers: String { return self._s[745]! } + public var ScheduledMessages_Title: String { return self._s[746]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[745]!, self._r[745]!, [_0]) + return formatWithArgumentRanges(self._s[747]!, self._r[747]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[746]! } - public var Settings_ProxyDisabled: String { return self._s[747]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[748]! } + public var Settings_ProxyDisabled: String { return self._s[749]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[748]!, self._r[748]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[750]!, self._r[750]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[749]!, self._r[749]!, [_0]) + return formatWithArgumentRanges(self._s[751]!, self._r[751]!, [_0]) } - public var ChatList_Context_RemoveFromRecents: String { return self._s[751]! } - public var Appearance_Title: String { return self._s[752]! } + public var ChatList_Context_RemoveFromRecents: String { return self._s[753]! } + public var Appearance_Title: String { return self._s[754]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[754]!, self._r[754]!, [_0]) + return formatWithArgumentRanges(self._s[756]!, self._r[756]!, [_0]) } - public var Conversation_WalletRequiredText: String { return self._s[755]! } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[756]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[757]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[758]! } - public var Preview_DeletePhoto: String { return self._s[759]! } - public var Appearance_AppIconFilledX: String { return self._s[760]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[761]! } + public var Conversation_WalletRequiredText: String { return self._s[757]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[758]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[759]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[760]! } + public var Preview_DeletePhoto: String { return self._s[761]! } + public var Appearance_AppIconFilledX: String { return self._s[762]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[763]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[762]!, self._r[762]!, [_0]) + return formatWithArgumentRanges(self._s[764]!, self._r[764]!, [_0]) } - public var Coub_TapForSound: String { return self._s[764]! } - public var Map_LocatingError: String { return self._s[765]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[767]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[768]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[769]! } + public var Coub_TapForSound: String { return self._s[766]! } + public var Map_LocatingError: String { return self._s[767]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[769]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[770]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[771]! } public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[770]!, self._r[770]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[772]!, self._r[772]!, [_1, _2, _3]) } - public var Passport_ForgottenPassword: String { return self._s[771]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[772]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[773]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[775]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[776]! } - public var Message_Location: String { return self._s[777]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[778]! } - public var Channel_Management_Title: String { return self._s[779]! } - public var DialogList_SearchSectionDialogs: String { return self._s[781]! } - public var Compose_NewChannel_Members: String { return self._s[782]! } + public var Passport_ForgottenPassword: String { return self._s[773]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[774]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[775]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[777]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[778]! } + public var Message_Location: String { return self._s[779]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[780]! } + public var Channel_Management_Title: String { return self._s[781]! } + public var DialogList_SearchSectionDialogs: String { return self._s[783]! } + public var Compose_NewChannel_Members: String { return self._s[784]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[783]!, self._r[783]!, [_0]) + return formatWithArgumentRanges(self._s[785]!, self._r[785]!, [_0]) } - public var GroupInfo_Location: String { return self._s[784]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[785]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[786]! } - public var PhotoEditor_WarmthTool: String { return self._s[787]! } - public var Passport_Language_tr: String { return self._s[788]! } + public var GroupInfo_Location: String { return self._s[786]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[787]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[788]! } + public var PhotoEditor_WarmthTool: String { return self._s[789]! } + public var Passport_Language_tr: String { return self._s[790]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[789]!, self._r[789]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[791]!, self._r[791]!, [_1, _2, _3]) } - public var Login_ResetAccountProtected_Reset: String { return self._s[791]! } - public var Watch_PhotoView_Title: String { return self._s[792]! } - public var Passport_Phone_Delete: String { return self._s[793]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[794]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[795]! } - public var GroupInfo_Permissions: String { return self._s[796]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[797]! } - public var Profile_ShareContactButton: String { return self._s[798]! } - public var ChatSettings_Other: String { return self._s[799]! } - public var UserInfo_NotificationsDisabled: String { return self._s[800]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[801]! } - public var LastSeen_WithinAMonth: String { return self._s[802]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[803]! } - public var Conversation_ReportGroupLocation: String { return self._s[804]! } - public var Conversation_EncryptionCanceled: String { return self._s[805]! } - public var MediaPicker_GroupDescription: String { return self._s[806]! } - public var WebSearch_Images: String { return self._s[807]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[793]! } + public var Watch_PhotoView_Title: String { return self._s[794]! } + public var Passport_Phone_Delete: String { return self._s[795]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[796]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[797]! } + public var GroupInfo_Permissions: String { return self._s[798]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[799]! } + public var Profile_ShareContactButton: String { return self._s[800]! } + public var ChatSettings_Other: String { return self._s[801]! } + public var UserInfo_NotificationsDisabled: String { return self._s[802]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[803]! } + public var LastSeen_WithinAMonth: String { return self._s[804]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[805]! } + public var Conversation_ReportGroupLocation: String { return self._s[806]! } + public var Conversation_EncryptionCanceled: String { return self._s[807]! } + public var MediaPicker_GroupDescription: String { return self._s[808]! } + public var WebSearch_Images: String { return self._s[809]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_0]) + return formatWithArgumentRanges(self._s[810]!, self._r[810]!, [_0]) } - public var Message_Photo: String { return self._s[809]! } - public var PasscodeSettings_HelpBottom: String { return self._s[810]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[811]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[812]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[813]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[814]! } - public var NotificationsSound_Calypso: String { return self._s[815]! } - public var Map_Map: String { return self._s[816]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[818]! } - public var ChatSettings_TextSizeUnits: String { return self._s[819]! } + public var Message_Photo: String { return self._s[811]! } + public var PasscodeSettings_HelpBottom: String { return self._s[812]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[813]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[814]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[815]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[816]! } + public var NotificationsSound_Calypso: String { return self._s[817]! } + public var Map_Map: String { return self._s[818]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[820]! } + public var ChatSettings_TextSizeUnits: String { return self._s[821]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[820]!, self._r[820]!, [_0]) + return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_0]) } - public var Common_of: String { return self._s[821]! } - public var Conversation_ForwardContacts: String { return self._s[824]! } + public var Common_of: String { return self._s[823]! } + public var Conversation_ForwardContacts: String { return self._s[826]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[826]!, self._r[826]!, [_0]) + return formatWithArgumentRanges(self._s[828]!, self._r[828]!, [_0]) } - public var Passport_Language_hy: String { return self._s[827]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[828]! } - public var AutoDownloadSettings_Reset: String { return self._s[829]! } - public var Wallet_TransactionInfo_AddressCopied: String { return self._s[830]! } - public var Paint_ClearConfirm: String { return self._s[831]! } - public var Camera_VideoMode: String { return self._s[832]! } + public var Passport_Language_hy: String { return self._s[829]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[830]! } + public var AutoDownloadSettings_Reset: String { return self._s[831]! } + public var Wallet_TransactionInfo_AddressCopied: String { return self._s[832]! } + public var Paint_ClearConfirm: String { return self._s[833]! } + public var Camera_VideoMode: String { return self._s[834]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[833]!, self._r[833]!, [_0]) + return formatWithArgumentRanges(self._s[835]!, self._r[835]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[834]! } - public var Conversation_ViewBackground: String { return self._s[835]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[836]! } + public var Conversation_ViewBackground: String { return self._s[837]! } public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[836]!, self._r[836]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[838]!, self._r[838]!, [_1, _2, _3]) } - public var Passport_Language_el: String { return self._s[837]! } - public var PhotoEditor_Original: String { return self._s[838]! } - public var Settings_FAQ_Button: String { return self._s[840]! } - public var Channel_Setup_PublicNoLink: String { return self._s[842]! } - public var Conversation_UnsupportedMedia: String { return self._s[843]! } - public var Conversation_SlideToCancel: String { return self._s[844]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[845]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[846]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[847]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[848]! } - public var AutoNightTheme_NotAvailable: String { return self._s[849]! } - public var Conversation_Owner: String { return self._s[850]! } - public var Common_Create: String { return self._s[851]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[852]! } - public var ContactList_Context_Call: String { return self._s[853]! } - public var Localization_ChooseLanguage: String { return self._s[855]! } - public var ChatList_Context_AddToContacts: String { return self._s[857]! } - public var Settings_Proxy: String { return self._s[859]! } - public var Privacy_TopPeersHelp: String { return self._s[860]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[861]! } - public var Chat_UnsendMyMessages: String { return self._s[862]! } + public var Passport_Language_el: String { return self._s[839]! } + public var PhotoEditor_Original: String { return self._s[840]! } + public var Settings_FAQ_Button: String { return self._s[842]! } + public var Channel_Setup_PublicNoLink: String { return self._s[844]! } + public var Conversation_UnsupportedMedia: String { return self._s[845]! } + public var Conversation_SlideToCancel: String { return self._s[846]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[847]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[848]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[849]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[850]! } + public var AutoNightTheme_NotAvailable: String { return self._s[851]! } + public var Conversation_Owner: String { return self._s[852]! } + public var Common_Create: String { return self._s[853]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[854]! } + public var ContactList_Context_Call: String { return self._s[855]! } + public var Localization_ChooseLanguage: String { return self._s[857]! } + public var ChatList_Context_AddToContacts: String { return self._s[859]! } + public var Settings_Proxy: String { return self._s[861]! } + public var Privacy_TopPeersHelp: String { return self._s[862]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[863]! } + public var Chat_UnsendMyMessages: String { return self._s[864]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[863]!, self._r[863]!, [_0]) + return formatWithArgumentRanges(self._s[865]!, self._r[865]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[864]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[866]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[866]!, self._r[866]!, [_0]) + return formatWithArgumentRanges(self._s[868]!, self._r[868]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[867]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[868]! } - public var Cache_Title: String { return self._s[869]! } + public var Contacts_SortedByPresence: String { return self._s[869]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[870]! } + public var Cache_Title: String { return self._s[871]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_0]) + return formatWithArgumentRanges(self._s[872]!, self._r[872]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[871]! } - public var Channel_Moderator_Title: String { return self._s[872]! } - public var InstantPage_AutoNightTheme: String { return self._s[874]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[873]! } + public var Channel_Moderator_Title: String { return self._s[874]! } + public var InstantPage_AutoNightTheme: String { return self._s[876]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[877]!, self._r[877]!, [_1]) + return formatWithArgumentRanges(self._s[879]!, self._r[879]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[878]! } - public var Undo_Undo: String { return self._s[880]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[881]! } - public var TwoStepAuth_RemovePassword: String { return self._s[882]! } - public var Common_Delete: String { return self._s[883]! } - public var Contacts_AddPeopleNearby: String { return self._s[885]! } - public var Conversation_ContextMenuDelete: String { return self._s[886]! } - public var SocksProxySetup_Credentials: String { return self._s[887]! } - public var Appearance_EditTheme: String { return self._s[889]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[890]! } - public var Wallet_Send_NetworkErrorText: String { return self._s[891]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[894]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[895]! } - public var Passport_Language_id: String { return self._s[897]! } - public var WallpaperSearch_ColorTeal: String { return self._s[898]! } - public var ChannelIntro_Title: String { return self._s[899]! } + public var Passport_Scans_Upload: String { return self._s[880]! } + public var Undo_Undo: String { return self._s[882]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[883]! } + public var TwoStepAuth_RemovePassword: String { return self._s[884]! } + public var Common_Delete: String { return self._s[885]! } + public var Contacts_AddPeopleNearby: String { return self._s[887]! } + public var Conversation_ContextMenuDelete: String { return self._s[888]! } + public var SocksProxySetup_Credentials: String { return self._s[889]! } + public var Appearance_EditTheme: String { return self._s[891]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[892]! } + public var Wallet_Send_NetworkErrorText: String { return self._s[893]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[896]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[897]! } + public var Passport_Language_id: String { return self._s[899]! } + public var WallpaperSearch_ColorTeal: String { return self._s[900]! } + public var ChannelIntro_Title: String { return self._s[901]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[900]!, self._r[900]!, [_0]) + return formatWithArgumentRanges(self._s[902]!, self._r[902]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[902]! } - public var VoiceOver_Chat_Reply: String { return self._s[903]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[904]! } - public var Channel_Info_Description: String { return self._s[905]! } - public var Stickers_FavoriteStickers: String { return self._s[906]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[907]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[908]! } - public var ChatSearch_ResultsTooltip: String { return self._s[909]! } - public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[910]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[911]! } - public var Group_PublicLink_Placeholder: String { return self._s[912]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[913]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[904]! } + public var VoiceOver_Chat_Reply: String { return self._s[905]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[906]! } + public var Channel_Info_Description: String { return self._s[907]! } + public var Stickers_FavoriteStickers: String { return self._s[908]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[909]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[910]! } + public var ChatSearch_ResultsTooltip: String { return self._s[911]! } + public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[912]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[913]! } + public var Group_PublicLink_Placeholder: String { return self._s[914]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[915]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[914]!, self._r[914]!, [_1]) + return formatWithArgumentRanges(self._s[916]!, self._r[916]!, [_1]) } - public var TextFormat_Underline: String { return self._s[915]! } + public var TextFormat_Underline: String { return self._s[917]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[916]!, self._r[916]!, [_1, _2]) + return formatWithArgumentRanges(self._s[918]!, self._r[918]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[917]!, self._r[917]!, [_0]) + return formatWithArgumentRanges(self._s[919]!, self._r[919]!, [_0]) } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[918]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[920]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[919]!, self._r[919]!, [_1, _2]) + return formatWithArgumentRanges(self._s[921]!, self._r[921]!, [_1, _2]) } - public var Wallet_Intro_ImportExisting: String { return self._s[920]! } - public var GroupPermission_Delete: String { return self._s[921]! } - public var Passport_Language_uk: String { return self._s[922]! } - public var StickerPack_HideStickers: String { return self._s[924]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[925]! } + public var Wallet_Intro_ImportExisting: String { return self._s[922]! } + public var GroupPermission_Delete: String { return self._s[923]! } + public var Passport_Language_uk: String { return self._s[924]! } + public var StickerPack_HideStickers: String { return self._s[926]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[927]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[926]!, self._r[926]!, [_1, _2]) + return formatWithArgumentRanges(self._s[928]!, self._r[928]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[927]! } + public var Activity_UploadingVideoMessage: String { return self._s[929]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[928]!, self._r[928]!, [_0]) + return formatWithArgumentRanges(self._s[930]!, self._r[930]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[929]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[930]! } - public var Settings_CallSettings: String { return self._s[931]! } - public var Camera_SquareMode: String { return self._s[932]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[933]! } - public var GroupInfo_SharedMediaNone: String { return self._s[934]! } + public var Channel_TitleInfo: String { return self._s[931]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[932]! } + public var Settings_CallSettings: String { return self._s[933]! } + public var Camera_SquareMode: String { return self._s[934]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[935]! } + public var GroupInfo_SharedMediaNone: String { return self._s[936]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[935]!, self._r[935]!, [_1]) + return formatWithArgumentRanges(self._s[937]!, self._r[937]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[936]! } - public var Application_Update: String { return self._s[938]! } - public var Month_ShortJanuary: String { return self._s[939]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[940]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[941]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[942]! } - public var Passport_Address_Street2Placeholder: String { return self._s[943]! } + public var Bot_GenericBotStatus: String { return self._s[938]! } + public var Application_Update: String { return self._s[940]! } + public var Month_ShortJanuary: String { return self._s[941]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[942]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[943]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[944]! } + public var Passport_Address_Street2Placeholder: String { return self._s[945]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[944]!, self._r[944]!, [_0]) + return formatWithArgumentRanges(self._s[946]!, self._r[946]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[945]! } - public var Appearance_PreviewOutgoingText: String { return self._s[946]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[947]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[949]! } - public var Map_Directions: String { return self._s[950]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[952]! } - public var Appearance_ThemeDay: String { return self._s[953]! } - public var LogoutOptions_LogOut: String { return self._s[954]! } - public var Group_PublicLink_Title: String { return self._s[956]! } - public var Channel_AddBotErrorNoRights: String { return self._s[957]! } - public var Passport_Identity_AddPassport: String { return self._s[958]! } - public var LocalGroup_ButtonTitle: String { return self._s[959]! } - public var Call_Message: String { return self._s[960]! } - public var PhotoEditor_ExposureTool: String { return self._s[961]! } - public var Wallet_Receive_CommentInfo: String { return self._s[963]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[964]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[966]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[967]! } - public var Appearance_Preview: String { return self._s[968]! } - public var Compose_ChannelMembers: String { return self._s[969]! } - public var Conversation_DeleteManyMessages: String { return self._s[970]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[971]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[972]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[973]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[976]! } - public var Conversation_UpdateTelegram: String { return self._s[977]! } - public var EditTheme_Create_TopInfo: String { return self._s[978]! } + public var NetworkUsageSettings_Cellular: String { return self._s[947]! } + public var Appearance_PreviewOutgoingText: String { return self._s[948]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[949]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[951]! } + public var Map_Directions: String { return self._s[952]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[954]! } + public var Appearance_ThemeDay: String { return self._s[955]! } + public var LogoutOptions_LogOut: String { return self._s[956]! } + public var Group_PublicLink_Title: String { return self._s[958]! } + public var Channel_AddBotErrorNoRights: String { return self._s[959]! } + public var Passport_Identity_AddPassport: String { return self._s[960]! } + public var LocalGroup_ButtonTitle: String { return self._s[961]! } + public var Call_Message: String { return self._s[962]! } + public var PhotoEditor_ExposureTool: String { return self._s[963]! } + public var Wallet_Receive_CommentInfo: String { return self._s[965]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[966]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[968]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[969]! } + public var Appearance_Preview: String { return self._s[970]! } + public var Compose_ChannelMembers: String { return self._s[971]! } + public var Conversation_DeleteManyMessages: String { return self._s[972]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[973]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[974]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[975]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[978]! } + public var Conversation_UpdateTelegram: String { return self._s[979]! } + public var EditTheme_Create_TopInfo: String { return self._s[980]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[979]!, self._r[979]!, [_0]) + return formatWithArgumentRanges(self._s[981]!, self._r[981]!, [_0]) } - public var Wallet_WordCheck_Continue: String { return self._s[980]! } + public var Wallet_WordCheck_Continue: String { return self._s[982]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[981]!, self._r[981]!, [_1]) + return formatWithArgumentRanges(self._s[983]!, self._r[983]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[982]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[983]! } + public var GroupInfo_Administrators_Title: String { return self._s[984]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[985]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[984]!, self._r[984]!, [_0]) + return formatWithArgumentRanges(self._s[986]!, self._r[986]!, [_0]) } - public var Tour_Title3: String { return self._s[985]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[986]! } - public var Clipboard_SendPhoto: String { return self._s[990]! } - public var MediaPicker_Videos: String { return self._s[991]! } - public var Passport_Email_Title: String { return self._s[992]! } + public var Tour_Title3: String { return self._s[987]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[988]! } + public var Clipboard_SendPhoto: String { return self._s[992]! } + public var MediaPicker_Videos: String { return self._s[993]! } + public var Passport_Email_Title: String { return self._s[994]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[993]!, self._r[993]!, [_0]) + return formatWithArgumentRanges(self._s[995]!, self._r[995]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[994]! } - public var Conversation_MessageDialogDelete: String { return self._s[995]! } - public var Privacy_Calls_CustomHelp: String { return self._s[997]! } - public var Message_Wallpaper: String { return self._s[998]! } - public var MemberSearch_BotSection: String { return self._s[999]! } - public var GroupInfo_SetSound: String { return self._s[1000]! } - public var Core_ServiceUserStatus: String { return self._s[1001]! } - public var LiveLocationUpdated_JustNow: String { return self._s[1002]! } - public var Call_StatusFailed: String { return self._s[1003]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1004]! } - public var TwoStepAuth_SetPassword: String { return self._s[1005]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[1006]! } + public var StickerPacksSettings_Title: String { return self._s[996]! } + public var Conversation_MessageDialogDelete: String { return self._s[997]! } + public var Privacy_Calls_CustomHelp: String { return self._s[999]! } + public var Message_Wallpaper: String { return self._s[1000]! } + public var MemberSearch_BotSection: String { return self._s[1001]! } + public var GroupInfo_SetSound: String { return self._s[1002]! } + public var Core_ServiceUserStatus: String { return self._s[1003]! } + public var LiveLocationUpdated_JustNow: String { return self._s[1004]! } + public var Call_StatusFailed: String { return self._s[1005]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1006]! } + public var TwoStepAuth_SetPassword: String { return self._s[1007]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[1008]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1008]!, self._r[1008]!, [_0]) + return formatWithArgumentRanges(self._s[1010]!, self._r[1010]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[1009]! } - public var Profile_Username: String { return self._s[1010]! } - public var Bot_DescriptionTitle: String { return self._s[1011]! } - public var MaskStickerSettings_Title: String { return self._s[1012]! } - public var SharedMedia_CategoryOther: String { return self._s[1013]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[1014]! } - public var Common_NotNow: String { return self._s[1015]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[1016]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[1017]! } - public var Map_Location: String { return self._s[1018]! } - public var Invitation_JoinGroup: String { return self._s[1019]! } - public var AutoDownloadSettings_Title: String { return self._s[1021]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1022]! } - public var Channel_ErrorAddBlocked: String { return self._s[1023]! } - public var Conversation_UnblockUser: String { return self._s[1024]! } - public var EditTheme_Edit_TopInfo: String { return self._s[1025]! } - public var Watch_Bot_Restart: String { return self._s[1026]! } - public var TwoStepAuth_Title: String { return self._s[1027]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[1028]! } - public var Checkout_ShippingMethod: String { return self._s[1029]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1030]! } + public var Calls_SubmitRating: String { return self._s[1011]! } + public var Profile_Username: String { return self._s[1012]! } + public var Bot_DescriptionTitle: String { return self._s[1013]! } + public var MaskStickerSettings_Title: String { return self._s[1014]! } + public var SharedMedia_CategoryOther: String { return self._s[1015]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1016]! } + public var Common_NotNow: String { return self._s[1017]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[1018]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[1019]! } + public var Map_Location: String { return self._s[1020]! } + public var Invitation_JoinGroup: String { return self._s[1021]! } + public var AutoDownloadSettings_Title: String { return self._s[1023]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1024]! } + public var Channel_ErrorAddBlocked: String { return self._s[1025]! } + public var Conversation_UnblockUser: String { return self._s[1026]! } + public var EditTheme_Edit_TopInfo: String { return self._s[1027]! } + public var Watch_Bot_Restart: String { return self._s[1028]! } + public var TwoStepAuth_Title: String { return self._s[1029]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[1030]! } + public var Checkout_ShippingMethod: String { return self._s[1031]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1032]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1031]!, self._r[1031]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1033]!, self._r[1033]!, [_1, _2, _3]) } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1033]!, self._r[1033]!, [_0]) + return formatWithArgumentRanges(self._s[1035]!, self._r[1035]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1034]!, self._r[1034]!, [_0]) + return formatWithArgumentRanges(self._s[1036]!, self._r[1036]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1035]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1036]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[1037]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[1038]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[1039]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1040]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1041]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[1042]! } - public var Checkout_PaymentMethod_Title: String { return self._s[1043]! } - public var SocksProxySetup_Connection: String { return self._s[1044]! } - public var Group_MessagePhotoRemoved: String { return self._s[1045]! } - public var Channel_Stickers_NotFound: String { return self._s[1048]! } - public var Group_About_Help: String { return self._s[1049]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[1050]! } - public var PeopleNearby_Title: String { return self._s[1052]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1037]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1038]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[1039]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[1040]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[1041]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1042]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1043]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[1044]! } + public var Checkout_PaymentMethod_Title: String { return self._s[1045]! } + public var SocksProxySetup_Connection: String { return self._s[1046]! } + public var Group_MessagePhotoRemoved: String { return self._s[1047]! } + public var Channel_Stickers_NotFound: String { return self._s[1050]! } + public var Group_About_Help: String { return self._s[1051]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1052]! } + public var PeopleNearby_Title: String { return self._s[1054]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1053]!, self._r[1053]!, [_1]) + return formatWithArgumentRanges(self._s[1055]!, self._r[1055]!, [_1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1055]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1056]! } - public var SocksProxySetup_Password: String { return self._s[1057]! } - public var Notifications_PermissionsEnable: String { return self._s[1058]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1060]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1057]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1058]! } + public var SocksProxySetup_Password: String { return self._s[1059]! } + public var Notifications_PermissionsEnable: String { return self._s[1060]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1062]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1061]!, self._r[1061]!, [_1]) + return formatWithArgumentRanges(self._s[1063]!, self._r[1063]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1063]!, self._r[1063]!, [_0]) + return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1064]! } - public var ArchivedPacksAlert_Title: String { return self._s[1065]! } - public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1066]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1066]! } + public var ArchivedPacksAlert_Title: String { return self._s[1067]! } + public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1068]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1067]!, self._r[1067]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1069]!, self._r[1069]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1068]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1070]! } - public var Conversation_StatusTyping: String { return self._s[1071]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1072]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1073]! } - public var UserInfo_CreateNewContact: String { return self._s[1074]! } - public var Passport_Identity_FrontSide: String { return self._s[1075]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1076]! } - public var Calls_CallTabTitle: String { return self._s[1077]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1078]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1070]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1072]! } + public var Conversation_StatusTyping: String { return self._s[1073]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1074]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1075]! } + public var UserInfo_CreateNewContact: String { return self._s[1076]! } + public var Passport_Identity_FrontSide: String { return self._s[1077]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1078]! } + public var Calls_CallTabTitle: String { return self._s[1079]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1080]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1080]!, self._r[1080]!, [_0]) + return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1081]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1082]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1083]! } - public var Wallet_Completed_Text: String { return self._s[1084]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1085]! } - public var Paint_Stickers: String { return self._s[1086]! } - public var Privacy_GroupsAndChannels: String { return self._s[1087]! } - public var ChatList_Context_Delete: String { return self._s[1089]! } - public var UserInfo_AddContact: String { return self._s[1090]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1083]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1084]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1085]! } + public var Wallet_Completed_Text: String { return self._s[1086]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1087]! } + public var Paint_Stickers: String { return self._s[1088]! } + public var Privacy_GroupsAndChannels: String { return self._s[1089]! } + public var ChatList_Context_Delete: String { return self._s[1091]! } + public var UserInfo_AddContact: String { return self._s[1092]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1091]!, self._r[1091]!, [_0]) + return formatWithArgumentRanges(self._s[1093]!, self._r[1093]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1093]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1095]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1095]!, self._r[1095]!, [_0]) + return formatWithArgumentRanges(self._s[1097]!, self._r[1097]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1096]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1097]! } - public var BlockedUsers_BlockUser: String { return self._s[1098]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1099]! } - public var MediaPicker_UngroupDescription: String { return self._s[1100]! } - public var Watch_NoConnection: String { return self._s[1101]! } - public var Month_GenSeptember: String { return self._s[1102]! } - public var Conversation_ViewGroup: String { return self._s[1104]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1107]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1108]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1109]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1110]! } - public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1111]! } - public var MediaPicker_CameraRoll: String { return self._s[1113]! } - public var Month_GenAugust: String { return self._s[1114]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1115]! } - public var SharedMedia_EmptyText: String { return self._s[1116]! } - public var Map_ShareLiveLocation: String { return self._s[1117]! } - public var Calls_All: String { return self._s[1118]! } - public var Appearance_ThemeNight: String { return self._s[1121]! } - public var Conversation_HoldForAudio: String { return self._s[1122]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1125]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1126]! } - public var SocksProxySetup_Secret: String { return self._s[1127]! } + public var DialogList_NoMessagesTitle: String { return self._s[1098]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1099]! } + public var BlockedUsers_BlockUser: String { return self._s[1100]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1101]! } + public var MediaPicker_UngroupDescription: String { return self._s[1102]! } + public var Watch_NoConnection: String { return self._s[1103]! } + public var Month_GenSeptember: String { return self._s[1104]! } + public var Conversation_ViewGroup: String { return self._s[1106]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1109]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1110]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1111]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1112]! } + public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1113]! } + public var MediaPicker_CameraRoll: String { return self._s[1115]! } + public var Month_GenAugust: String { return self._s[1116]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1117]! } + public var SharedMedia_EmptyText: String { return self._s[1118]! } + public var Map_ShareLiveLocation: String { return self._s[1119]! } + public var Calls_All: String { return self._s[1120]! } + public var Appearance_ThemeNight: String { return self._s[1123]! } + public var Conversation_HoldForAudio: String { return self._s[1124]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1127]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1128]! } + public var SocksProxySetup_Secret: String { return self._s[1129]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1128]!, self._r[1128]!, [_0]) + return formatWithArgumentRanges(self._s[1130]!, self._r[1130]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1130]! } - public var Conversation_Location: String { return self._s[1131]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1132]! } + public var Conversation_Location: String { return self._s[1133]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1132]!, self._r[1132]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1134]!, self._r[1134]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1134]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1135]! } - public var Notifications_PermissionsText: String { return self._s[1136]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1137]! } - public var Call_Flip: String { return self._s[1138]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1140]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1141]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1142]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1144]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1146]! } - public var Channel_TooMuchBots: String { return self._s[1148]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1149]! } - public var Login_InvalidCodeError: String { return self._s[1150]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1151]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1136]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1137]! } + public var Notifications_PermissionsText: String { return self._s[1138]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1139]! } + public var Call_Flip: String { return self._s[1140]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1142]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1143]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1144]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1146]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1148]! } + public var Channel_TooMuchBots: String { return self._s[1150]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1151]! } + public var Login_InvalidCodeError: String { return self._s[1152]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1153]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1152]!, self._r[1152]!, [_0]) + return formatWithArgumentRanges(self._s[1154]!, self._r[1154]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1153]!, self._r[1153]!, [_0]) + return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1154]! } - public var Call_CallInProgressTitle: String { return self._s[1155]! } - public var Month_ShortSeptember: String { return self._s[1156]! } - public var Watch_ChannelInfo_Title: String { return self._s[1157]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1160]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1161]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1162]! } - public var Wallet_Receive_Title: String { return self._s[1163]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1164]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1165]! } - public var PhotoEditor_CropReset: String { return self._s[1166]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1168]! } - public var Channel_Management_LabelEditor: String { return self._s[1169]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1171]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1172]! } - public var Wallet_Info_WalletCreated: String { return self._s[1173]! } - public var UserInfo_Title: String { return self._s[1174]! } - public var ChatList_HideAction: String { return self._s[1175]! } - public var AccessDenied_Title: String { return self._s[1176]! } - public var DialogList_SearchLabel: String { return self._s[1177]! } - public var Group_Setup_HistoryHidden: String { return self._s[1178]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1179]! } - public var State_Updating: String { return self._s[1181]! } - public var Contacts_TabTitle: String { return self._s[1182]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1184]! } - public var GroupInfo_GroupHistory: String { return self._s[1185]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1186]! } - public var Wallpaper_SetColor: String { return self._s[1187]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1188]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1189]! } - public var Chat_AttachmentLimitReached: String { return self._s[1190]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1191]! } - public var Contacts_NotRegisteredSection: String { return self._s[1192]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1156]! } + public var Call_CallInProgressTitle: String { return self._s[1157]! } + public var Month_ShortSeptember: String { return self._s[1158]! } + public var Watch_ChannelInfo_Title: String { return self._s[1159]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1162]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1163]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1164]! } + public var Wallet_Receive_Title: String { return self._s[1165]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1166]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1167]! } + public var PhotoEditor_CropReset: String { return self._s[1168]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1170]! } + public var Channel_Management_LabelEditor: String { return self._s[1171]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1173]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1174]! } + public var Wallet_Info_WalletCreated: String { return self._s[1175]! } + public var UserInfo_Title: String { return self._s[1176]! } + public var ChatList_HideAction: String { return self._s[1177]! } + public var AccessDenied_Title: String { return self._s[1178]! } + public var DialogList_SearchLabel: String { return self._s[1179]! } + public var Group_Setup_HistoryHidden: String { return self._s[1180]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1181]! } + public var State_Updating: String { return self._s[1183]! } + public var Contacts_TabTitle: String { return self._s[1184]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1186]! } + public var GroupInfo_GroupHistory: String { return self._s[1187]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1188]! } + public var Wallpaper_SetColor: String { return self._s[1189]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1190]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1191]! } + public var Chat_AttachmentLimitReached: String { return self._s[1192]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1193]! } + public var Contacts_NotRegisteredSection: String { return self._s[1194]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1193]!, self._r[1193]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1195]!, self._r[1195]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1194]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1195]! } - public var SocksProxySetup_Connecting: String { return self._s[1196]! } - public var ExplicitContent_AlertChannel: String { return self._s[1197]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1198]! } - public var Conversation_Contact: String { return self._s[1199]! } - public var Login_CodeExpired: String { return self._s[1200]! } - public var Passport_DiscardMessageAction: String { return self._s[1201]! } - public var ChatList_Context_Unpin: String { return self._s[1202]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1203]! } + public var Paint_Clear: String { return self._s[1196]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1197]! } + public var SocksProxySetup_Connecting: String { return self._s[1198]! } + public var ExplicitContent_AlertChannel: String { return self._s[1199]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1200]! } + public var Conversation_Contact: String { return self._s[1201]! } + public var Login_CodeExpired: String { return self._s[1202]! } + public var Passport_DiscardMessageAction: String { return self._s[1203]! } + public var ChatList_Context_Unpin: String { return self._s[1204]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1205]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1204]!, self._r[1204]!, [_0]) + return formatWithArgumentRanges(self._s[1206]!, self._r[1206]!, [_0]) } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1205]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1206]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1207]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1208]! } public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1207]!, self._r[1207]!, [_0]) + return formatWithArgumentRanges(self._s[1209]!, self._r[1209]!, [_0]) } - public var Month_ShortApril: String { return self._s[1208]! } - public var AuthSessions_CurrentSession: String { return self._s[1209]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1212]! } - public var Wallet_Navigation_Cancel: String { return self._s[1214]! } - public var WallpaperPreview_CropTopText: String { return self._s[1215]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1216]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1217]! } + public var Month_ShortApril: String { return self._s[1210]! } + public var AuthSessions_CurrentSession: String { return self._s[1211]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1214]! } + public var Wallet_Navigation_Cancel: String { return self._s[1216]! } + public var WallpaperPreview_CropTopText: String { return self._s[1217]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1218]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1219]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1218]!, self._r[1218]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1220]!, self._r[1220]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1219]! } - public var Channel_Setup_TypePrivate: String { return self._s[1221]! } - public var Forward_ChannelReadOnly: String { return self._s[1224]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1225]! } - public var AddContact_SharedContactException: String { return self._s[1226]! } - public var UserInfo_BotPrivacy: String { return self._s[1228]! } - public var Wallet_CreateInvoice_Title: String { return self._s[1229]! } - public var Notification_PassportValueEmail: String { return self._s[1230]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1231]! } - public var GroupPermission_NewTitle: String { return self._s[1232]! } - public var CallFeedback_ReasonDropped: String { return self._s[1233]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1234]! } - public var Channel_SignMessages_Help: String { return self._s[1236]! } - public var Undo_ChatDeleted: String { return self._s[1238]! } - public var Conversation_ChatBackground: String { return self._s[1239]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1221]! } + public var Channel_Setup_TypePrivate: String { return self._s[1223]! } + public var Forward_ChannelReadOnly: String { return self._s[1226]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1227]! } + public var AddContact_SharedContactException: String { return self._s[1228]! } + public var UserInfo_BotPrivacy: String { return self._s[1230]! } + public var Wallet_CreateInvoice_Title: String { return self._s[1231]! } + public var Notification_PassportValueEmail: String { return self._s[1232]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1233]! } + public var GroupPermission_NewTitle: String { return self._s[1234]! } + public var CallFeedback_ReasonDropped: String { return self._s[1235]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1236]! } + public var Channel_SignMessages_Help: String { return self._s[1238]! } + public var Undo_ChatDeleted: String { return self._s[1240]! } + public var Conversation_ChatBackground: String { return self._s[1241]! } public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1240]!, self._r[1240]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1242]!, self._r[1242]!, [_1, _2, _3]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1241]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1242]! } - public var Passport_Language_pt: String { return self._s[1243]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1244]! } - public var NotificationsSound_Popcorn: String { return self._s[1247]! } - public var AutoNightTheme_Disabled: String { return self._s[1248]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1249]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1250]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1251]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1252]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1243]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1244]! } + public var Passport_Language_pt: String { return self._s[1245]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1246]! } + public var NotificationsSound_Popcorn: String { return self._s[1249]! } + public var AutoNightTheme_Disabled: String { return self._s[1250]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1251]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1252]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1253]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1254]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1253]!, self._r[1253]!, [_0]) + return formatWithArgumentRanges(self._s[1255]!, self._r[1255]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1254]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1255]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1257]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1256]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1257]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1259]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1258]!, self._r[1258]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1260]!, self._r[1260]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1261]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1262]! } - public var Compose_NewEncryptedChat: String { return self._s[1263]! } - public var Login_CodeFloodError: String { return self._s[1264]! } - public var Calls_TabTitle: String { return self._s[1265]! } - public var Privacy_ProfilePhoto: String { return self._s[1266]! } - public var Passport_Language_he: String { return self._s[1267]! } + public var SocksProxySetup_Hostname: String { return self._s[1263]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1264]! } + public var Compose_NewEncryptedChat: String { return self._s[1265]! } + public var Login_CodeFloodError: String { return self._s[1266]! } + public var Calls_TabTitle: String { return self._s[1267]! } + public var Privacy_ProfilePhoto: String { return self._s[1268]! } + public var Passport_Language_he: String { return self._s[1269]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1268]!, self._r[1268]!, [_0]) - } - public var GroupPermission_Title: String { return self._s[1269]! } - public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1270]!, self._r[1270]!, [_0]) } - public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1271]! } - public var GroupPermission_NoChangeInfo: String { return self._s[1272]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1273]! } - public var Tour_Text1: String { return self._s[1274]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1275]! } - public var Month_ShortFebruary: String { return self._s[1276]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1277]! } + public var GroupPermission_Title: String { return self._s[1271]! } + public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1272]!, self._r[1272]!, [_0]) + } + public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1273]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1274]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1275]! } + public var Tour_Text1: String { return self._s[1276]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1277]! } + public var Month_ShortFebruary: String { return self._s[1278]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1279]! } public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1278]!, self._r[1278]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1280]!, self._r[1280]!, [_1, _2, _3]) } - public var NotificationsSound_Glass: String { return self._s[1279]! } - public var Appearance_ThemeNightBlue: String { return self._s[1280]! } - public var CheckoutInfo_Pay: String { return self._s[1281]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1283]! } - public var Call_CallAgain: String { return self._s[1285]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1286]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1287]! } - public var Passport_InvalidPasswordError: String { return self._s[1288]! } - public var Watch_Message_Game: String { return self._s[1289]! } - public var Stickers_Install: String { return self._s[1290]! } - public var VoiceOver_Chat_Message: String { return self._s[1291]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1292]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1294]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1295]! } - public var AuthSessions_OtherSessions: String { return self._s[1296]! } - public var Channel_Username_Help: String { return self._s[1297]! } - public var Camera_Title: String { return self._s[1298]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1300]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1301]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1302]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1303]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1304]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1305]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1306]! } - public var Conversation_RestrictedStickers: String { return self._s[1307]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1309]! } - public var UserInfo_TelegramCall: String { return self._s[1311]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1312]! } - public var CreatePoll_OptionsHeader: String { return self._s[1313]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1314]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1315]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1316]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1317]! } + public var NotificationsSound_Glass: String { return self._s[1281]! } + public var Appearance_ThemeNightBlue: String { return self._s[1282]! } + public var CheckoutInfo_Pay: String { return self._s[1283]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1285]! } + public var Call_CallAgain: String { return self._s[1287]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1288]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1289]! } + public var Passport_InvalidPasswordError: String { return self._s[1290]! } + public var Watch_Message_Game: String { return self._s[1291]! } + public var Stickers_Install: String { return self._s[1292]! } + public var VoiceOver_Chat_Message: String { return self._s[1293]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1294]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1296]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1297]! } + public var AuthSessions_OtherSessions: String { return self._s[1298]! } + public var Channel_Username_Help: String { return self._s[1299]! } + public var Camera_Title: String { return self._s[1300]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1302]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1303]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1304]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1305]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1306]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1307]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1308]! } + public var Conversation_RestrictedStickers: String { return self._s[1309]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1311]! } + public var UserInfo_TelegramCall: String { return self._s[1313]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1314]! } + public var CreatePoll_OptionsHeader: String { return self._s[1315]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1316]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1317]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1318]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1319]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1318]!, self._r[1318]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1320]!, self._r[1320]!, [_1, _2, _3]) } - public var Wallet_Month_GenAugust: String { return self._s[1319]! } - public var Settings_SaveEditedPhotos: String { return self._s[1320]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1321]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1322]! } - public var Conversation_MessageDialogRetry: String { return self._s[1323]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1324]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1325]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1326]! } - public var Group_Setup_TypeHeader: String { return self._s[1327]! } - public var Paint_RecentStickers: String { return self._s[1328]! } - public var PhotoEditor_GrainTool: String { return self._s[1329]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1330]! } - public var EmptyGroupInfo_Line4: String { return self._s[1331]! } - public var Watch_AuthRequired: String { return self._s[1333]! } + public var Wallet_Month_GenAugust: String { return self._s[1321]! } + public var Settings_SaveEditedPhotos: String { return self._s[1322]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1323]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1324]! } + public var Conversation_MessageDialogRetry: String { return self._s[1325]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1326]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1327]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1328]! } + public var Group_Setup_TypeHeader: String { return self._s[1329]! } + public var Paint_RecentStickers: String { return self._s[1330]! } + public var PhotoEditor_GrainTool: String { return self._s[1331]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1332]! } + public var EmptyGroupInfo_Line4: String { return self._s[1333]! } + public var Watch_AuthRequired: String { return self._s[1335]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1334]!, self._r[1334]!, [_0]) + return formatWithArgumentRanges(self._s[1336]!, self._r[1336]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1335]! } - public var ChannelIntro_Text: String { return self._s[1336]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1337]! } - public var GroupPermission_NoSendMedia: String { return self._s[1338]! } - public var Calls_AddTab: String { return self._s[1339]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1340]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1341]! } - public var Conversation_WalletRequiredSetup: String { return self._s[1342]! } - public var Notification_MessageLifetime1d: String { return self._s[1343]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1344]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1345]! } - public var Passport_Identity_GenderFemale: String { return self._s[1346]! } - public var BlockedUsers_BlockTitle: String { return self._s[1347]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1337]! } + public var ChannelIntro_Text: String { return self._s[1338]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1339]! } + public var GroupPermission_NoSendMedia: String { return self._s[1340]! } + public var Calls_AddTab: String { return self._s[1341]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1342]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1343]! } + public var Conversation_WalletRequiredSetup: String { return self._s[1344]! } + public var Notification_MessageLifetime1d: String { return self._s[1345]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1346]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1347]! } + public var Passport_Identity_GenderFemale: String { return self._s[1348]! } + public var BlockedUsers_BlockTitle: String { return self._s[1349]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_1]) + return formatWithArgumentRanges(self._s[1350]!, self._r[1350]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1349]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1350]! } - public var Settings_Context_Logout: String { return self._s[1351]! } - public var Wallet_Info_UnknownTransaction: String { return self._s[1352]! } - public var ChatList_ArchiveAction: String { return self._s[1353]! } - public var AutoNightTheme_Scheduled: String { return self._s[1354]! } + public var Weekday_Yesterday: String { return self._s[1351]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1352]! } + public var Settings_Context_Logout: String { return self._s[1353]! } + public var Wallet_Info_UnknownTransaction: String { return self._s[1354]! } + public var ChatList_ArchiveAction: String { return self._s[1355]! } + public var AutoNightTheme_Scheduled: String { return self._s[1356]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1355]!, self._r[1355]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1357]!, self._r[1357]!, [_1, _2, _3, _4, _5, _6]) } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1356]! } - public var Wallet_Receive_CreateInvoice: String { return self._s[1357]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1358]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1358]! } + public var Wallet_Receive_CreateInvoice: String { return self._s[1359]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1360]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1359]!, self._r[1359]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1361]!, self._r[1361]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1360]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1361]! } + public var CreatePoll_Create: String { return self._s[1362]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1363]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1364]!, self._r[1364]!, [_1, _2]) } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1363]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1364]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1366]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1365]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1366]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1368]! } public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1367]!, self._r[1367]!, [_1]) + return formatWithArgumentRanges(self._s[1369]!, self._r[1369]!, [_1]) } - public var Preview_OpenInInstagram: String { return self._s[1368]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1369]! } + public var Preview_OpenInInstagram: String { return self._s[1370]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1371]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1370]!, self._r[1370]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1372]!, self._r[1372]!, [_1, _2, _3]) } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1371]!, self._r[1371]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1373]!, self._r[1373]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1372]! } - public var ArchivedChats_IntroText3: String { return self._s[1373]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1374]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1375]! } - public var Wallet_Month_GenSeptember: String { return self._s[1376]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1377]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1374]! } + public var ArchivedChats_IntroText3: String { return self._s[1375]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1376]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1377]! } + public var Wallet_Month_GenSeptember: String { return self._s[1378]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1379]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1378]!, self._r[1378]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1380]!, self._r[1380]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1380]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1381]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1382]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1383]! } - public var Gif_NoGifsFound: String { return self._s[1384]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1385]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1386]! } - public var EditTheme_Preview: String { return self._s[1387]! } - public var GroupInfo_ActionPromote: String { return self._s[1388]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1389]! } - public var GroupInfo_Permissions_Title: String { return self._s[1390]! } - public var Permissions_ContactsText_v0: String { return self._s[1391]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1392]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1393]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1396]! } - public var Passport_FieldEmailHelp: String { return self._s[1397]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1382]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1383]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1384]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1385]! } + public var Gif_NoGifsFound: String { return self._s[1386]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1387]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1388]! } + public var EditTheme_Preview: String { return self._s[1389]! } + public var GroupInfo_ActionPromote: String { return self._s[1390]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1391]! } + public var GroupInfo_Permissions_Title: String { return self._s[1392]! } + public var Permissions_ContactsText_v0: String { return self._s[1393]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1394]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1395]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1398]! } + public var Passport_FieldEmailHelp: String { return self._s[1399]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1398]!, self._r[1398]!, [_0]) + return formatWithArgumentRanges(self._s[1400]!, self._r[1400]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1399]! } - public var Weekday_ShortSaturday: String { return self._s[1400]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1401]! } - public var Watch_Conversation_UserInfo: String { return self._s[1402]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1403]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1404]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1405]! } - public var PhotoEditor_VignetteTool: String { return self._s[1406]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1407]! } - public var Passport_Language_et: String { return self._s[1408]! } - public var AppUpgrade_Running: String { return self._s[1409]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1411]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1412]! } - public var Passport_Language_bg: String { return self._s[1413]! } - public var Stickers_NoStickersFound: String { return self._s[1415]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1401]! } + public var Weekday_ShortSaturday: String { return self._s[1402]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1403]! } + public var Watch_Conversation_UserInfo: String { return self._s[1404]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1405]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1406]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1407]! } + public var PhotoEditor_VignetteTool: String { return self._s[1408]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1409]! } + public var Passport_Language_et: String { return self._s[1410]! } + public var AppUpgrade_Running: String { return self._s[1411]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1413]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1414]! } + public var Passport_Language_bg: String { return self._s[1415]! } + public var Stickers_NoStickersFound: String { return self._s[1417]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1417]!, self._r[1417]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1419]!, self._r[1419]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1418]!, self._r[1418]!, [_0]) + return formatWithArgumentRanges(self._s[1420]!, self._r[1420]!, [_0]) } - public var Wallet_Month_GenJuly: String { return self._s[1419]! } - public var Wallet_Receive_AddressHeader: String { return self._s[1420]! } - public var Wallet_Send_AmountText: String { return self._s[1421]! } - public var Settings_About: String { return self._s[1422]! } + public var Wallet_Month_GenJuly: String { return self._s[1421]! } + public var Wallet_Receive_AddressHeader: String { return self._s[1422]! } + public var Wallet_Send_AmountText: String { return self._s[1423]! } + public var Settings_About: String { return self._s[1424]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1425]!, self._r[1425]!, [_0, _1, _2]) } - public var ChatList_Context_MarkAsRead: String { return self._s[1425]! } - public var KeyCommand_NewMessage: String { return self._s[1426]! } - public var Group_ErrorAddBlocked: String { return self._s[1427]! } + public var ChatList_Context_MarkAsRead: String { return self._s[1427]! } + public var KeyCommand_NewMessage: String { return self._s[1428]! } + public var Group_ErrorAddBlocked: String { return self._s[1429]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1428]!, self._r[1428]!, [_0]) + return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1429]! } - public var ReportGroupLocation_Title: String { return self._s[1430]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1431]! } - public var Cache_ClearProgress: String { return self._s[1432]! } + public var Map_LocationTitle: String { return self._s[1431]! } + public var ReportGroupLocation_Title: String { return self._s[1432]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1433]! } + public var Cache_ClearProgress: String { return self._s[1434]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1433]!, self._r[1433]!, [_0]) + return formatWithArgumentRanges(self._s[1435]!, self._r[1435]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1434]! } - public var Passport_UpdateRequiredError: String { return self._s[1435]! } - public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1436]! } + public var GroupRemoved_AddToGroup: String { return self._s[1436]! } + public var Passport_UpdateRequiredError: String { return self._s[1437]! } + public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1438]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1437]!, self._r[1437]!, [_1]) + return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1439]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1440]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1441]! } - public var Passport_Language_ka: String { return self._s[1442]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1441]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1442]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1443]! } + public var Passport_Language_ka: String { return self._s[1444]! } public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1443]!, self._r[1443]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_1, _2, _3]) } - public var Call_Decline: String { return self._s[1444]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1445]! } + public var Call_Decline: String { return self._s[1446]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1447]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1448]!, self._r[1448]!, [_0]) + return formatWithArgumentRanges(self._s[1450]!, self._r[1450]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1449]! } - public var EditTheme_EditTitle: String { return self._s[1450]! } + public var CallFeedback_Send: String { return self._s[1451]! } + public var EditTheme_EditTitle: String { return self._s[1452]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1451]!, self._r[1451]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1452]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1454]! } public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1454]!, self._r[1454]!, [_0]) + return formatWithArgumentRanges(self._s[1456]!, self._r[1456]!, [_0]) } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1455]! } - public var Passport_DeletePassport: String { return self._s[1456]! } - public var Appearance_AppIconFilled: String { return self._s[1457]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1458]! } - public var Month_ShortDecember: String { return self._s[1459]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1461]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1457]! } + public var Passport_DeletePassport: String { return self._s[1458]! } + public var Appearance_AppIconFilled: String { return self._s[1459]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1460]! } + public var Month_ShortDecember: String { return self._s[1461]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1463]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1462]!, self._r[1462]!, [_0]) + return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1463]! } - public var Conversation_EncryptedDescription1: String { return self._s[1464]! } - public var Conversation_EncryptedDescription2: String { return self._s[1465]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1466]! } - public var Conversation_EncryptedDescription3: String { return self._s[1468]! } - public var PhotoEditor_SharpenTool: String { return self._s[1469]! } + public var Channel_Stickers_Searching: String { return self._s[1465]! } + public var Conversation_EncryptedDescription1: String { return self._s[1466]! } + public var Conversation_EncryptedDescription2: String { return self._s[1467]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1468]! } + public var Conversation_EncryptedDescription3: String { return self._s[1470]! } + public var PhotoEditor_SharpenTool: String { return self._s[1471]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1470]!, self._r[1470]!, [_0]) + return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1472]! } - public var Channel_Members_AddMembers: String { return self._s[1473]! } - public var Wallpaper_Search: String { return self._s[1474]! } - public var Weekday_Friday: String { return self._s[1475]! } - public var Privacy_ContactsSync: String { return self._s[1476]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1477]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1478]! } + public var Conversation_EncryptedDescription4: String { return self._s[1474]! } + public var Channel_Members_AddMembers: String { return self._s[1475]! } + public var Wallpaper_Search: String { return self._s[1476]! } + public var Weekday_Friday: String { return self._s[1477]! } + public var Privacy_ContactsSync: String { return self._s[1478]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1479]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1480]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_0]) + return formatWithArgumentRanges(self._s[1481]!, self._r[1481]!, [_0]) } - public var GroupInfo_Permissions_Removed: String { return self._s[1480]! } - public var Passport_Identity_GenderMale: String { return self._s[1481]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1482]! } + public var Passport_Identity_GenderMale: String { return self._s[1483]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_0]) + return formatWithArgumentRanges(self._s[1484]!, self._r[1484]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1483]! } - public var Conversation_JumpToDate: String { return self._s[1484]! } - public var Contacts_GlobalSearch: String { return self._s[1485]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1486]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1487]! } - public var Profile_MessageLifetime1d: String { return self._s[1488]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1485]! } + public var Conversation_JumpToDate: String { return self._s[1486]! } + public var Contacts_GlobalSearch: String { return self._s[1487]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1488]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1489]! } + public var Profile_MessageLifetime1d: String { return self._s[1490]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1489]!, self._r[1489]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1491]!, self._r[1491]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1492]! } + public var StickerPack_BuiltinPackName: String { return self._s[1494]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1493]!, self._r[1493]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1495]!, self._r[1495]!, [_1, _2]) } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1494]! } - public var Passport_InfoTitle: String { return self._s[1496]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1497]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1496]! } + public var Passport_InfoTitle: String { return self._s[1498]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1499]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1501]!, self._r[1501]!, [_0]) + return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1502]!, self._r[1502]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1504]!, self._r[1504]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1503]! } - public var Profile_BotInfo: String { return self._s[1504]! } - public var Watch_Compose_CreateMessage: String { return self._s[1505]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1506]! } - public var Month_ShortNovember: String { return self._s[1507]! } - public var Conversation_ScamWarning: String { return self._s[1508]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1509]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1510]! } - public var NotificationsSound_Chime: String { return self._s[1511]! } - public var Passport_Language_ko: String { return self._s[1513]! } - public var InviteText_URL: String { return self._s[1514]! } - public var TextFormat_Monospace: String { return self._s[1515]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1505]! } + public var Profile_BotInfo: String { return self._s[1506]! } + public var Watch_Compose_CreateMessage: String { return self._s[1507]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1508]! } + public var Month_ShortNovember: String { return self._s[1509]! } + public var Conversation_ScamWarning: String { return self._s[1510]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1511]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1512]! } + public var NotificationsSound_Chime: String { return self._s[1513]! } + public var Passport_Language_ko: String { return self._s[1515]! } + public var InviteText_URL: String { return self._s[1516]! } + public var TextFormat_Monospace: String { return self._s[1517]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1516]!, self._r[1516]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1518]!, self._r[1518]!, [_1, _2, _3]) } - public var EditTheme_Edit_BottomInfo: String { return self._s[1517]! } + public var EditTheme_Edit_BottomInfo: String { return self._s[1519]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1518]!, self._r[1518]!, [_0]) + return formatWithArgumentRanges(self._s[1520]!, self._r[1520]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1521]!, self._r[1521]!, [_1, _2]) } - public var Wallet_Words_Title: String { return self._s[1520]! } - public var Wallet_Month_ShortMay: String { return self._s[1521]! } - public var EditTheme_CreateTitle: String { return self._s[1523]! } - public var Passport_InfoLearnMore: String { return self._s[1524]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1525]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1526]! } - public var Your_card_has_expired: String { return self._s[1527]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1528]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1529]! } - public var Conversation_Report: String { return self._s[1533]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1534]! } - public var Notification_MessageLifetime1m: String { return self._s[1535]! } - public var Privacy_ContactsTitle: String { return self._s[1536]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1537]! } - public var Wallet_WordCheck_Title: String { return self._s[1538]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1539]! } - public var Channel_Members_Title: String { return self._s[1540]! } - public var Map_OpenInWaze: String { return self._s[1541]! } - public var Login_PhoneBannedError: String { return self._s[1542]! } + public var Wallet_Words_Title: String { return self._s[1522]! } + public var Wallet_Month_ShortMay: String { return self._s[1523]! } + public var EditTheme_CreateTitle: String { return self._s[1525]! } + public var Passport_InfoLearnMore: String { return self._s[1526]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1527]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1528]! } + public var Your_card_has_expired: String { return self._s[1529]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1530]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1531]! } + public var Conversation_Report: String { return self._s[1535]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1536]! } + public var Notification_MessageLifetime1m: String { return self._s[1537]! } + public var Privacy_ContactsTitle: String { return self._s[1538]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1539]! } + public var Wallet_WordCheck_Title: String { return self._s[1540]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1541]! } + public var Channel_Members_Title: String { return self._s[1542]! } + public var Map_OpenInWaze: String { return self._s[1543]! } + public var Login_PhoneBannedError: String { return self._s[1544]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1543]!, self._r[1543]!, [_0]) + return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_0]) } - public var Group_Management_AddModeratorHelp: String { return self._s[1544]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1545]! } - public var Common_OK: String { return self._s[1546]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1547]! } - public var Wallet_Words_NotDoneResponse: String { return self._s[1548]! } - public var Cache_Music: String { return self._s[1549]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1550]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1551]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1552]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1546]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1547]! } + public var Common_OK: String { return self._s[1548]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1549]! } + public var Wallet_Words_NotDoneResponse: String { return self._s[1550]! } + public var Cache_Music: String { return self._s[1551]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1552]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1553]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1554]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1553]!, self._r[1553]!, [_1]) + return formatWithArgumentRanges(self._s[1555]!, self._r[1555]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1554]!, self._r[1554]!, [_0]) + return formatWithArgumentRanges(self._s[1556]!, self._r[1556]!, [_0]) } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1555]!, self._r[1555]!, [_0]) + return formatWithArgumentRanges(self._s[1557]!, self._r[1557]!, [_0]) } - public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1556]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1558]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1559]! } - public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1561]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1562]! } - public var State_ConnectingToProxyInfo: String { return self._s[1563]! } - public var Message_VideoMessage: String { return self._s[1565]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1566]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1567]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1568]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1569]! } + public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1558]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1560]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1561]! } + public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1563]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1564]! } + public var State_ConnectingToProxyInfo: String { return self._s[1565]! } + public var Message_VideoMessage: String { return self._s[1567]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1568]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1569]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1570]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1571]! } public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1570]!, self._r[1570]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1572]!, self._r[1572]!, [_1, _2, _3]) } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1571]! } - public var Activity_RecordingAudio: String { return self._s[1572]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1573]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1574]! } - public var Wallet_Info_Address: String { return self._s[1575]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1573]! } + public var Activity_RecordingAudio: String { return self._s[1574]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1575]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1576]! } + public var Wallet_Info_Address: String { return self._s[1577]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1577]!, self._r[1577]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1579]!, self._r[1579]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1581]!, self._r[1581]!, [_0]) + return formatWithArgumentRanges(self._s[1583]!, self._r[1583]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1582]! } - public var UserInfo_AddPhone: String { return self._s[1583]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1584]! } + public var Conversation_ApplyLocalization: String { return self._s[1584]! } + public var UserInfo_AddPhone: String { return self._s[1585]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1586]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1585]!, self._r[1585]!, [_0]) + return formatWithArgumentRanges(self._s[1587]!, self._r[1587]!, [_0]) } - public var Passport_Scans: String { return self._s[1587]! } - public var BlockedUsers_Unblock: String { return self._s[1588]! } + public var Passport_Scans: String { return self._s[1589]! } + public var BlockedUsers_Unblock: String { return self._s[1590]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1589]!, self._r[1589]!, [_1]) + return formatWithArgumentRanges(self._s[1591]!, self._r[1591]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1590]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1591]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1592]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1593]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1594]! } + public var Channel_Management_LabelCreator: String { return self._s[1592]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1593]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1594]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1595]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1596]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1595]!, self._r[1595]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1597]!, self._r[1597]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1596]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1597]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1598]! } - public var ChannelIntro_CreateChannel: String { return self._s[1599]! } - public var Conversation_UnreadMessages: String { return self._s[1600]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1601]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1602]! } - public var Theme_Context_Apply: String { return self._s[1603]! } - public var Notification_GroupActivated: String { return self._s[1604]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1605]! } - public var Wallet_Intro_CreateWallet: String { return self._s[1606]! } + public var Login_PhoneNumberHelp: String { return self._s[1598]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1599]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1600]! } + public var ChannelIntro_CreateChannel: String { return self._s[1601]! } + public var Conversation_UnreadMessages: String { return self._s[1602]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1603]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1604]! } + public var Theme_Context_Apply: String { return self._s[1605]! } + public var Notification_GroupActivated: String { return self._s[1606]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1607]! } + public var Wallet_Intro_CreateWallet: String { return self._s[1608]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1607]!, self._r[1607]!, [_0]) + return formatWithArgumentRanges(self._s[1609]!, self._r[1609]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1610]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1612]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_0]) + return formatWithArgumentRanges(self._s[1613]!, self._r[1613]!, [_0]) } - public var Undo_DeletedChannel: String { return self._s[1612]! } - public var CallFeedback_AddComment: String { return self._s[1613]! } + public var Undo_DeletedChannel: String { return self._s[1614]! } + public var CallFeedback_AddComment: String { return self._s[1615]! } public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1614]!, self._r[1614]!, [_0]) - } - public var Document_TargetConfirmationFormat: String { return self._s[1615]! } - public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1616]!, self._r[1616]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1617]! } + public var Document_TargetConfirmationFormat: String { return self._s[1617]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1618]!, self._r[1618]!, [_0]) + } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1619]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1618]!, self._r[1618]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_1, _2, _3, _4]) } - public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1619]! } - public var Theme_ErrorNotFound: String { return self._s[1620]! } - public var Contacts_SortByName: String { return self._s[1621]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1622]! } + public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1621]! } + public var Theme_ErrorNotFound: String { return self._s[1622]! } + public var Contacts_SortByName: String { return self._s[1623]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1624]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1624]!, self._r[1624]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1626]!, self._r[1626]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1625]! } - public var ScheduledMessages_EditTime: String { return self._s[1626]! } - public var Conversation_ClearSelfHistory: String { return self._s[1627]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1628]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1629]! } - public var Stickers_SuggestNone: String { return self._s[1630]! } - public var ChatSettings_Cache: String { return self._s[1631]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1632]! } - public var Media_ShareThisPhoto: String { return self._s[1633]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1634]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1635]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1636]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1637]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1638]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1639]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1627]! } + public var ScheduledMessages_EditTime: String { return self._s[1628]! } + public var Conversation_ClearSelfHistory: String { return self._s[1629]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1630]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1631]! } + public var Stickers_SuggestNone: String { return self._s[1632]! } + public var ChatSettings_Cache: String { return self._s[1633]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1634]! } + public var Media_ShareThisPhoto: String { return self._s[1635]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1636]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1637]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1638]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1639]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1640]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1641]! } public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1640]!, self._r[1640]!, [_0]) + return formatWithArgumentRanges(self._s[1642]!, self._r[1642]!, [_0]) } - public var Permissions_CellularDataTitle_v0: String { return self._s[1641]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1643]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1644]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1645]! } - public var Map_OpenIn: String { return self._s[1646]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1643]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1645]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1646]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1647]! } + public var Map_OpenIn: String { return self._s[1648]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_1]) + return formatWithArgumentRanges(self._s[1651]!, self._r[1651]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1650]!, self._r[1650]!, [_0]) + return formatWithArgumentRanges(self._s[1652]!, self._r[1652]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1651]! } - public var MessagePoll_LabelClosed: String { return self._s[1652]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1654]! } - public var Wallet_Send_SendAnyway: String { return self._s[1655]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1656]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1657]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1658]! } - public var Login_SelectCountry_Title: String { return self._s[1659]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1660]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1653]! } + public var MessagePoll_LabelClosed: String { return self._s[1654]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1656]! } + public var Wallet_Send_SendAnyway: String { return self._s[1657]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1658]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1659]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1660]! } + public var Login_SelectCountry_Title: String { return self._s[1661]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1662]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1663]!, self._r[1663]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1662]! } - public var Watch_Suggestion_BRB: String { return self._s[1663]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1664]! } - public var Contacts_PermissionsTitle: String { return self._s[1665]! } - public var Conversation_RestrictedInline: String { return self._s[1666]! } - public var StickerPack_ViewPack: String { return self._s[1668]! } - public var Wallet_UnknownError: String { return self._s[1669]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1664]! } + public var Watch_Suggestion_BRB: String { return self._s[1665]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1666]! } + public var Contacts_PermissionsTitle: String { return self._s[1667]! } + public var Conversation_RestrictedInline: String { return self._s[1668]! } + public var StickerPack_ViewPack: String { return self._s[1670]! } + public var Wallet_UnknownError: String { return self._s[1671]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1670]!, self._r[1670]!, [_0]) + return formatWithArgumentRanges(self._s[1672]!, self._r[1672]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1672]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1675]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1677]! } - public var Channel_Info_Stickers: String { return self._s[1678]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1679]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1680]! } - public var Passport_DeletePersonalDetails: String { return self._s[1681]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1682]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1683]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1684]! } - public var Conversation_SearchNoResults: String { return self._s[1686]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1687]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1688]! } - public var Login_Code: String { return self._s[1689]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1690]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1691]! } - public var Weekday_ShortThursday: String { return self._s[1692]! } - public var Resolve_ErrorNotFound: String { return self._s[1694]! } - public var LastSeen_Offline: String { return self._s[1695]! } - public var PeopleNearby_NoMembers: String { return self._s[1696]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1697]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1698]! } - public var GroupInfo_Title: String { return self._s[1700]! } - public var NotificationsSound_Note: String { return self._s[1701]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1702]! } - public var Watch_Message_Poll: String { return self._s[1703]! } - public var Privacy_Calls: String { return self._s[1704]! } + public var Compose_NewChannel: String { return self._s[1674]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1677]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1679]! } + public var Channel_Info_Stickers: String { return self._s[1680]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1681]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1682]! } + public var Passport_DeletePersonalDetails: String { return self._s[1683]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1684]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1685]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1686]! } + public var Conversation_SearchNoResults: String { return self._s[1688]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1689]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1690]! } + public var Login_Code: String { return self._s[1691]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1692]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1693]! } + public var Weekday_ShortThursday: String { return self._s[1694]! } + public var Resolve_ErrorNotFound: String { return self._s[1696]! } + public var LastSeen_Offline: String { return self._s[1697]! } + public var PeopleNearby_NoMembers: String { return self._s[1698]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1699]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1700]! } + public var GroupInfo_Title: String { return self._s[1702]! } + public var NotificationsSound_Note: String { return self._s[1703]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1704]! } + public var Watch_Message_Poll: String { return self._s[1705]! } + public var Privacy_Calls: String { return self._s[1706]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1705]!, self._r[1705]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1707]!, self._r[1707]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1706]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1707]! } - public var Notifications_Reset: String { return self._s[1708]! } - public var Conversation_Pin: String { return self._s[1709]! } - public var Passport_Language_lv: String { return self._s[1710]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1711]! } - public var BlockedUsers_Info: String { return self._s[1712]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1714]! } - public var Watch_Conversation_Unblock: String { return self._s[1716]! } + public var Month_ShortAugust: String { return self._s[1708]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1709]! } + public var Notifications_Reset: String { return self._s[1710]! } + public var Conversation_Pin: String { return self._s[1711]! } + public var Passport_Language_lv: String { return self._s[1712]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1713]! } + public var BlockedUsers_Info: String { return self._s[1714]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1716]! } + public var Watch_Conversation_Unblock: String { return self._s[1718]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1717]!, self._r[1717]!, [_0]) + return formatWithArgumentRanges(self._s[1719]!, self._r[1719]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1718]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1719]! } + public var CloudStorage_Title: String { return self._s[1720]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1721]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1720]!, self._r[1720]!, [_0]) + return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1721]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1722]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1723]! } - public var Passport_Address_EditBankStatement: String { return self._s[1724]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1723]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1724]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1725]! } + public var Passport_Address_EditBankStatement: String { return self._s[1726]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1727]!, self._r[1727]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1726]! } - public var ShareMenu_Comment: String { return self._s[1727]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1728]! } - public var Notifications_PermissionsTitle: String { return self._s[1729]! } - public var GroupPermission_NoSendLinks: String { return self._s[1730]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1731]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1732]! } - public var Settings_Support: String { return self._s[1733]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1734]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1735]! } - public var Privacy_Forwards_Preview: String { return self._s[1736]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1737]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1738]! } - public var Common_Select: String { return self._s[1740]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1741]! } - public var WallpaperSearch_ColorGray: String { return self._s[1744]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1745]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1746]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1747]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1748]! } - public var Widget_AuthRequired: String { return self._s[1749]! } - public var Camera_FlashOn: String { return self._s[1750]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1751]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1752]! } - public var Watch_Suggestion_OK: String { return self._s[1753]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1728]! } + public var ShareMenu_Comment: String { return self._s[1729]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1730]! } + public var Notifications_PermissionsTitle: String { return self._s[1731]! } + public var GroupPermission_NoSendLinks: String { return self._s[1732]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1733]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1734]! } + public var Settings_Support: String { return self._s[1735]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1736]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1737]! } + public var Privacy_Forwards_Preview: String { return self._s[1738]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1739]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1740]! } + public var Common_Select: String { return self._s[1742]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1743]! } + public var WallpaperSearch_ColorGray: String { return self._s[1746]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1747]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1748]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1749]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1750]! } + public var Widget_AuthRequired: String { return self._s[1751]! } + public var Camera_FlashOn: String { return self._s[1752]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1753]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1754]! } + public var Watch_Suggestion_OK: String { return self._s[1755]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1755]!, self._r[1755]!, [_0]) - } - public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1757]!, self._r[1757]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1758]! } - public var DialogList_AdLabel: String { return self._s[1759]! } - public var WatchRemote_NotificationText: String { return self._s[1760]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1761]! } - public var Conversation_ReportSpam: String { return self._s[1762]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1763]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1765]! } - public var PhoneLabel_Title: String { return self._s[1766]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1767]! } - public var Settings_ChangePhoneNumber: String { return self._s[1768]! } - public var Notifications_ExceptionsTitle: String { return self._s[1769]! } - public var Notifications_AlertTones: String { return self._s[1770]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1771]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1772]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1773]! } - public var VoiceOver_Chat_Photo: String { return self._s[1775]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1776]! } - public var ReportPeer_ReasonOther: String { return self._s[1777]! } - public var ChatList_Context_JoinChannel: String { return self._s[1778]! } - public var KeyCommand_ScrollDown: String { return self._s[1780]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1781]! } + public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1759]!, self._r[1759]!, [_0]) + } + public var TextFormat_Strikethrough: String { return self._s[1760]! } + public var DialogList_AdLabel: String { return self._s[1761]! } + public var WatchRemote_NotificationText: String { return self._s[1762]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1763]! } + public var Conversation_ReportSpam: String { return self._s[1764]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1765]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1767]! } + public var PhoneLabel_Title: String { return self._s[1768]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1769]! } + public var Settings_ChangePhoneNumber: String { return self._s[1770]! } + public var Notifications_ExceptionsTitle: String { return self._s[1771]! } + public var Notifications_AlertTones: String { return self._s[1772]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1773]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1774]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1775]! } + public var VoiceOver_Chat_Photo: String { return self._s[1777]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1778]! } + public var ReportPeer_ReasonOther: String { return self._s[1779]! } + public var ChatList_Context_JoinChannel: String { return self._s[1780]! } + public var KeyCommand_ScrollDown: String { return self._s[1782]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1783]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_0]) + return formatWithArgumentRanges(self._s[1784]!, self._r[1784]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1783]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1784]! } - public var AuthSessions_LogOut: String { return self._s[1785]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1786]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1787]! } - public var Passport_Phone_Title: String { return self._s[1788]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1789]! } - public var Settings_PhoneNumber: String { return self._s[1790]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1785]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1786]! } + public var AuthSessions_LogOut: String { return self._s[1787]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1788]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1789]! } + public var Passport_Phone_Title: String { return self._s[1790]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1791]! } + public var Settings_PhoneNumber: String { return self._s[1792]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_0]) + return formatWithArgumentRanges(self._s[1793]!, self._r[1793]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1792]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1793]! } - public var WebSearch_SearchNoResults: String { return self._s[1794]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1796]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1797]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1798]! } - public var PhotoEditor_CurvesTool: String { return self._s[1799]! } - public var Checkout_PaymentMethod: String { return self._s[1801]! } + public var NotificationsSound_Alert: String { return self._s[1794]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1795]! } + public var WebSearch_SearchNoResults: String { return self._s[1796]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1798]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1799]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1800]! } + public var PhotoEditor_CurvesTool: String { return self._s[1801]! } + public var Checkout_PaymentMethod: String { return self._s[1803]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1802]!, self._r[1802]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1804]!, self._r[1804]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1803]! } - public var Camera_PhotoMode: String { return self._s[1806]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1807]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1809]! } - public var CallSettings_OnMobile: String { return self._s[1810]! } - public var Tour_Text2: String { return self._s[1811]! } + public var Contacts_AccessDeniedError: String { return self._s[1805]! } + public var Camera_PhotoMode: String { return self._s[1808]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1809]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1811]! } + public var CallSettings_OnMobile: String { return self._s[1812]! } + public var Tour_Text2: String { return self._s[1813]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1812]!, self._r[1812]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1814]!, self._r[1814]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1814]! } - public var Permissions_Skip: String { return self._s[1815]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1816]! } - public var SecretImage_Title: String { return self._s[1817]! } - public var Watch_MessageView_Title: String { return self._s[1818]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1819]! } - public var AttachmentMenu_Poll: String { return self._s[1820]! } + public var DialogList_EncryptionProcessing: String { return self._s[1816]! } + public var Permissions_Skip: String { return self._s[1817]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1818]! } + public var SecretImage_Title: String { return self._s[1819]! } + public var Watch_MessageView_Title: String { return self._s[1820]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1821]! } + public var AttachmentMenu_Poll: String { return self._s[1822]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_0]) + return formatWithArgumentRanges(self._s[1823]!, self._r[1823]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1822]!, self._r[1822]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1824]!, self._r[1824]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1823]! } - public var WallpaperPreview_Title: String { return self._s[1824]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1825]! } - public var Settings_ProxyConnecting: String { return self._s[1826]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1828]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1829]! } - public var Wallet_Intro_Title: String { return self._s[1830]! } - public var Profile_MessageLifetime5s: String { return self._s[1831]! } - public var Username_InvalidCharacters: String { return self._s[1832]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1833]! } - public var ScheduledMessages_ClearAll: String { return self._s[1834]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1835]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1836]! } - public var Settings_AddAccount: String { return self._s[1837]! } - public var Notification_CreatedChannel: String { return self._s[1840]! } + public var Notification_CallCanceled: String { return self._s[1825]! } + public var WallpaperPreview_Title: String { return self._s[1826]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1827]! } + public var Settings_ProxyConnecting: String { return self._s[1828]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1830]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1831]! } + public var Wallet_Intro_Title: String { return self._s[1832]! } + public var Profile_MessageLifetime5s: String { return self._s[1833]! } + public var Username_InvalidCharacters: String { return self._s[1834]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1835]! } + public var ScheduledMessages_ClearAll: String { return self._s[1836]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1837]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1838]! } + public var Settings_AddAccount: String { return self._s[1839]! } + public var Notification_CreatedChannel: String { return self._s[1842]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1841]!, self._r[1841]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1843]!, self._r[1843]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1843]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1844]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1845]! } - public var Contacts_TopSection: String { return self._s[1846]! } + public var Passcode_AppLockedAlert: String { return self._s[1845]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1846]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1847]! } + public var Contacts_TopSection: String { return self._s[1848]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1849]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1850]!, self._r[1850]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1848]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1849]! } + public var Wallet_Info_Receive: String { return self._s[1851]! } + public var Wallet_Completed_ViewWallet: String { return self._s[1852]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1850]!, self._r[1850]!, [_0]) + return formatWithArgumentRanges(self._s[1853]!, self._r[1853]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1851]! } - public var UserInfo_TapToCall: String { return self._s[1852]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1854]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1855]! } - public var Common_Search: String { return self._s[1856]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1857]! } + public var ReportPeer_ReasonSpam: String { return self._s[1854]! } + public var UserInfo_TapToCall: String { return self._s[1855]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1857]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1858]! } + public var Common_Search: String { return self._s[1859]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1860]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1858]!, self._r[1858]!, [_0]) + return formatWithArgumentRanges(self._s[1861]!, self._r[1861]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[1859]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1860]! } - public var Message_InvoiceLabel: String { return self._s[1861]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1862]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1863]! } + public var Wallet_Month_ShortJuly: String { return self._s[1862]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1863]! } + public var Message_InvoiceLabel: String { return self._s[1864]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1865]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1866]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1864]!, self._r[1864]!, [_0]) + return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) } - public var Conversation_Info: String { return self._s[1865]! } - public var Login_InfoDeletePhoto: String { return self._s[1866]! } - public var Passport_Language_vi: String { return self._s[1868]! } - public var UserInfo_ScamUserWarning: String { return self._s[1869]! } - public var Conversation_Search: String { return self._s[1870]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1872]! } - public var ReportPeer_ReasonPornography: String { return self._s[1873]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1874]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1875]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1876]! } - public var Channel_Setup_TypeHeader: String { return self._s[1877]! } - public var AuthSessions_LoggedIn: String { return self._s[1878]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1879]! } - public var Login_SmsRequestState3: String { return self._s[1880]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1881]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1882]! } - public var Join_ChannelsTooMuch: String { return self._s[1883]! } - public var Channel_Edit_LinkItem: String { return self._s[1884]! } - public var Privacy_Calls_P2PNever: String { return self._s[1885]! } - public var Conversation_AddToReadingList: String { return self._s[1887]! } - public var Share_MultipleMessagesDisabled: String { return self._s[1888]! } - public var Message_Animation: String { return self._s[1889]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1890]! } - public var Map_Unknown: String { return self._s[1891]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1892]! } + public var Conversation_Info: String { return self._s[1868]! } + public var Login_InfoDeletePhoto: String { return self._s[1869]! } + public var Passport_Language_vi: String { return self._s[1871]! } + public var UserInfo_ScamUserWarning: String { return self._s[1872]! } + public var Conversation_Search: String { return self._s[1873]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1875]! } + public var ReportPeer_ReasonPornography: String { return self._s[1876]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1877]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1878]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1879]! } + public var Channel_Setup_TypeHeader: String { return self._s[1880]! } + public var AuthSessions_LoggedIn: String { return self._s[1881]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1882]! } + public var Login_SmsRequestState3: String { return self._s[1883]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1884]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1885]! } + public var Join_ChannelsTooMuch: String { return self._s[1886]! } + public var Channel_Edit_LinkItem: String { return self._s[1887]! } + public var Privacy_Calls_P2PNever: String { return self._s[1888]! } + public var Conversation_AddToReadingList: String { return self._s[1890]! } + public var Share_MultipleMessagesDisabled: String { return self._s[1891]! } + public var Message_Animation: String { return self._s[1892]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1893]! } + public var Map_Unknown: String { return self._s[1894]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1895]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1893]!, self._r[1893]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1896]!, self._r[1896]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1894]!, self._r[1894]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1897]!, self._r[1897]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1895]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1896]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1897]! } + public var Call_StatusRequesting: String { return self._s[1898]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1899]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1900]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1898]!, self._r[1898]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_0]) + return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_0]) } - public var Update_Skip: String { return self._s[1900]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1901]! } - public var Message_PinnedPollMessage: String { return self._s[1902]! } - public var BlockedUsers_Title: String { return self._s[1903]! } + public var Update_Skip: String { return self._s[1903]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1904]! } + public var Message_PinnedPollMessage: String { return self._s[1905]! } + public var BlockedUsers_Title: String { return self._s[1906]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1904]!, self._r[1904]!, [_1]) + return formatWithArgumentRanges(self._s[1907]!, self._r[1907]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1905]! } - public var NotificationsSound_Bell: String { return self._s[1906]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1907]! } - public var Weekday_Monday: String { return self._s[1908]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1909]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1910]! } - public var ChatSettings_Groups: String { return self._s[1911]! } + public var Username_CheckingUsername: String { return self._s[1908]! } + public var NotificationsSound_Bell: String { return self._s[1909]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1910]! } + public var Weekday_Monday: String { return self._s[1911]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1912]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1913]! } + public var ChatSettings_Groups: String { return self._s[1914]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1912]!, self._r[1912]!, [_0]) + return formatWithArgumentRanges(self._s[1915]!, self._r[1915]!, [_0]) } - public var Your_card_was_declined: String { return self._s[1913]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1915]! } - public var Wallet_Month_ShortApril: String { return self._s[1916]! } - public var ChatList_Unmute: String { return self._s[1917]! } - public var PhotoEditor_CurvesAll: String { return self._s[1918]! } - public var Weekday_ShortTuesday: String { return self._s[1919]! } - public var DialogList_Read: String { return self._s[1920]! } - public var Appearance_AppIconClassic: String { return self._s[1921]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1922]! } - public var Passport_Identity_Gender: String { return self._s[1923]! } + public var Your_card_was_declined: String { return self._s[1916]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1918]! } + public var Wallet_Month_ShortApril: String { return self._s[1919]! } + public var ChatList_Unmute: String { return self._s[1920]! } + public var PhotoEditor_CurvesAll: String { return self._s[1921]! } + public var Weekday_ShortTuesday: String { return self._s[1922]! } + public var DialogList_Read: String { return self._s[1923]! } + public var Appearance_AppIconClassic: String { return self._s[1924]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1925]! } + public var Passport_Identity_Gender: String { return self._s[1926]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1924]!, self._r[1924]!, [_0]) - } - public var Target_SelectGroup: String { return self._s[1925]! } - public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1927]!, self._r[1927]!, [_0]) } - public var Passport_Language_en: String { return self._s[1928]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1929]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1930]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1931]! } - public var ScheduledMessages_SendNow: String { return self._s[1932]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[1934]! } - public var Login_InfoHelp: String { return self._s[1935]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1936]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1937]! } + public var Target_SelectGroup: String { return self._s[1928]! } + public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1930]!, self._r[1930]!, [_0]) + } + public var Passport_Language_en: String { return self._s[1931]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1932]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1933]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1934]! } + public var ScheduledMessages_SendNow: String { return self._s[1935]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[1937]! } + public var Login_InfoHelp: String { return self._s[1938]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1939]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1940]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1938]!, self._r[1938]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1941]!, self._r[1941]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[1941]! } - public var CreatePoll_Title: String { return self._s[1942]! } - public var Conversation_ViewTheme: String { return self._s[1943]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1944]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1945]! } - public var UserInfo_GroupsInCommon: String { return self._s[1946]! } - public var Call_AudioRouteHide: String { return self._s[1947]! } + public var SocksProxySetup_AddProxy: String { return self._s[1944]! } + public var CreatePoll_Title: String { return self._s[1945]! } + public var Conversation_ViewTheme: String { return self._s[1946]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1947]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1948]! } + public var UserInfo_GroupsInCommon: String { return self._s[1949]! } + public var Call_AudioRouteHide: String { return self._s[1950]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1949]!, self._r[1949]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1952]!, self._r[1952]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[1950]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1953]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1951]!, self._r[1951]!, [_0]) + return formatWithArgumentRanges(self._s[1954]!, self._r[1954]!, [_0]) } - public var TextFormat_Bold: String { return self._s[1952]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[1953]! } - public var Notifications_Title: String { return self._s[1954]! } - public var Group_Username_InvalidTooShort: String { return self._s[1955]! } - public var Channel_ErrorAddTooMuch: String { return self._s[1956]! } + public var TextFormat_Bold: String { return self._s[1955]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[1956]! } + public var Notifications_Title: String { return self._s[1957]! } + public var Group_Username_InvalidTooShort: String { return self._s[1958]! } + public var Channel_ErrorAddTooMuch: String { return self._s[1959]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1957]!, self._r[1957]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[1959]! } - public var Stickers_SuggestAdded: String { return self._s[1960]! } - public var Login_CountryCode: String { return self._s[1961]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[1962]! } - public var Map_GetDirections: String { return self._s[1963]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[1964]! } - public var Login_PhoneFloodError: String { return self._s[1965]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[1962]! } + public var Stickers_SuggestAdded: String { return self._s[1963]! } + public var Login_CountryCode: String { return self._s[1964]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[1965]! } + public var Map_GetDirections: String { return self._s[1966]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[1967]! } + public var Login_PhoneFloodError: String { return self._s[1968]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1966]!, self._r[1966]!, [_0]) + return formatWithArgumentRanges(self._s[1969]!, self._r[1969]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1967]!, self._r[1967]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1970]!, self._r[1970]!, [_1, _2, _3]) } - public var Settings_SetUsername: String { return self._s[1969]! } - public var Group_Location_ChangeLocation: String { return self._s[1970]! } - public var Notification_GroupInviterSelf: String { return self._s[1971]! } - public var InstantPage_TapToOpenLink: String { return self._s[1972]! } + public var Settings_SetUsername: String { return self._s[1972]! } + public var Group_Location_ChangeLocation: String { return self._s[1973]! } + public var Notification_GroupInviterSelf: String { return self._s[1974]! } + public var InstantPage_TapToOpenLink: String { return self._s[1975]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1973]!, self._r[1973]!, [_0]) + return formatWithArgumentRanges(self._s[1976]!, self._r[1976]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[1974]! } - public var SecretChat_Title: String { return self._s[1975]! } - public var Group_UpgradeNoticeText1: String { return self._s[1976]! } - public var AuthSessions_Title: String { return self._s[1977]! } + public var Watch_Suggestion_TalkLater: String { return self._s[1977]! } + public var SecretChat_Title: String { return self._s[1978]! } + public var Group_UpgradeNoticeText1: String { return self._s[1979]! } + public var AuthSessions_Title: String { return self._s[1980]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1978]!, self._r[1978]!, [_0]) + return formatWithArgumentRanges(self._s[1981]!, self._r[1981]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[1979]! } - public var Channel_About_Title: String { return self._s[1980]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[1981]! } + public var PhotoEditor_CropAuto: String { return self._s[1982]! } + public var Channel_About_Title: String { return self._s[1983]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[1984]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1983]!, self._r[1983]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1986]!, self._r[1986]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[1984]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1986]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[1987]! } + public var VoiceOver_MessageContextReport: String { return self._s[1987]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1989]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[1990]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1988]!, self._r[1988]!, [_1]) + return formatWithArgumentRanges(self._s[1991]!, self._r[1991]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1990]!, self._r[1990]!, [_0]) + return formatWithArgumentRanges(self._s[1993]!, self._r[1993]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1991]!, self._r[1991]!, [_0]) + return formatWithArgumentRanges(self._s[1994]!, self._r[1994]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[1992]! } - public var Presence_online: String { return self._s[1995]! } - public var PasscodeSettings_Title: String { return self._s[1996]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1997]! } - public var Web_OpenExternal: String { return self._s[1998]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2000]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2001]! } - public var LocalGroup_Title: String { return self._s[2002]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[1995]! } + public var Presence_online: String { return self._s[1998]! } + public var PasscodeSettings_Title: String { return self._s[1999]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2000]! } + public var Web_OpenExternal: String { return self._s[2001]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2003]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2004]! } + public var LocalGroup_Title: String { return self._s[2005]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2003]!, self._r[2003]!, [_0]) - } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2004]! } - public var Map_YouAreHere: String { return self._s[2005]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_0]) } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2007]!, self._r[2007]!, [_0]) + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2007]! } + public var Map_YouAreHere: String { return self._s[2008]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2009]!, self._r[2009]!, [_0]) } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2008]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2009]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_0]) } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2011]!, self._r[2011]!, [_0]) + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2011]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2012]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2013]!, self._r[2013]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2012]! } - public var Bot_Start: String { return self._s[2013]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2014]!, self._r[2014]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2015]!, self._r[2015]!, [_0]) + public var SocksProxySetup_Username: String { return self._s[2015]! } + public var Bot_Start: String { return self._s[2016]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2016]! } - public var AccentColor_Title: String { return self._s[2018]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2019]! } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2018]!, self._r[2018]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[2019]! } + public var AccentColor_Title: String { return self._s[2021]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2022]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2020]!, self._r[2020]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2023]!, self._r[2023]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2021]!, self._r[2021]!, [_0]) + return formatWithArgumentRanges(self._s[2024]!, self._r[2024]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2023]! } - public var Login_InfoAvatarPhoto: String { return self._s[2024]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2025]! } - public var Tour_Title4: String { return self._s[2026]! } - public var Passport_Identity_Translation: String { return self._s[2027]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2028]! } - public var Login_TermsOfServiceLabel: String { return self._s[2030]! } - public var Passport_Language_it: String { return self._s[2031]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2032]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2033]! } - public var Conversation_ClearAll: String { return self._s[2035]! } - public var Wallet_Send_UninitializedText: String { return self._s[2037]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2038]! } - public var TwoStepAuth_FloodError: String { return self._s[2039]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2026]! } + public var Login_InfoAvatarPhoto: String { return self._s[2027]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2028]! } + public var Tour_Title4: String { return self._s[2029]! } + public var Passport_Identity_Translation: String { return self._s[2030]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2031]! } + public var Login_TermsOfServiceLabel: String { return self._s[2033]! } + public var Passport_Language_it: String { return self._s[2034]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2035]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2036]! } + public var Conversation_ClearAll: String { return self._s[2038]! } + public var Wallet_Send_UninitializedText: String { return self._s[2040]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2041]! } + public var TwoStepAuth_FloodError: String { return self._s[2042]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2040]!, self._r[2040]!, [_1]) + return formatWithArgumentRanges(self._s[2043]!, self._r[2043]!, [_1]) } - public var Paint_Delete: String { return self._s[2041]! } + public var Paint_Delete: String { return self._s[2044]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2042]!, self._r[2042]!, [_0]) + return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2043]! } + public var Privacy_AddNewPeer: String { return self._s[2046]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2044]!, self._r[2044]!, [_1]) + return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2045]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2048]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2046]!, self._r[2046]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2049]!, self._r[2049]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2047]! } + public var Message_PinnedAudioMessage: String { return self._s[2050]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2048]!, self._r[2048]!, [_0]) + return formatWithArgumentRanges(self._s[2051]!, self._r[2051]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2049]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2050]! } - public var Wallet_Month_GenNovember: String { return self._s[2051]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2052]! } - public var Conversation_MessageEditedLabel: String { return self._s[2053]! } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2054]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2055]! } + public var Notification_Mute1hMin: String { return self._s[2052]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2053]! } + public var Wallet_Month_GenNovember: String { return self._s[2054]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2055]! } + public var Conversation_MessageEditedLabel: String { return self._s[2056]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2057]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2058]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2056]!, self._r[2056]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2057]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2060]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_1]) + return formatWithArgumentRanges(self._s[2061]!, self._r[2061]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2059]! } - public var Month_GenOctober: String { return self._s[2060]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2061]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2062]! } - public var MediaPicker_TimerTooltip: String { return self._s[2064]! } - public var SharedMedia_TitleAll: String { return self._s[2065]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2068]! } - public var Conversation_RestrictedMedia: String { return self._s[2069]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2070]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2072]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2073]! } + public var AccessDenied_LocationTracking: String { return self._s[2062]! } + public var Month_GenOctober: String { return self._s[2063]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2064]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2065]! } + public var MediaPicker_TimerTooltip: String { return self._s[2067]! } + public var SharedMedia_TitleAll: String { return self._s[2068]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2071]! } + public var Conversation_RestrictedMedia: String { return self._s[2072]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2073]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2075]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2076]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2074]!, self._r[2074]!, [_0]) + return formatWithArgumentRanges(self._s[2077]!, self._r[2077]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2077]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2079]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2080]! } + public var Conversation_SavedMessages: String { return self._s[2080]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2082]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2083]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2082]!, self._r[2082]!, [_0]) + return formatWithArgumentRanges(self._s[2085]!, self._r[2085]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[2083]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2086]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, [_0]) + return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2085]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2086]! } + public var ReportPeer_AlertSuccess: String { return self._s[2088]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2089]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2090]!, self._r[2090]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2088]! } - public var PhotoEditor_FadeTool: String { return self._s[2089]! } - public var Privacy_ContactsReset: String { return self._s[2090]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2091]! } + public var PhotoEditor_FadeTool: String { return self._s[2092]! } + public var Privacy_ContactsReset: String { return self._s[2093]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_0]) + return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2093]! } - public var ChatList_Mute: String { return self._s[2094]! } + public var Message_PinnedVideoMessage: String { return self._s[2096]! } + public var ChatList_Mute: String { return self._s[2097]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2098]!, self._r[2098]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2096]! } - public var ShareMenu_SelectChats: String { return self._s[2099]! } - public var ChatList_Context_Unarchive: String { return self._s[2100]! } - public var MusicPlayer_VoiceNote: String { return self._s[2101]! } - public var Conversation_RestrictedText: String { return self._s[2102]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2103]! } - public var Wallet_Month_GenApril: String { return self._s[2104]! } - public var Wallet_Month_ShortMarch: String { return self._s[2105]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2106]! } - public var Cache_Videos: String { return self._s[2107]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2108]! } - public var Wallet_Month_GenFebruary: String { return self._s[2109]! } - public var FeatureDisabled_Oops: String { return self._s[2111]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2112]! } + public var Permissions_CellularDataText_v0: String { return self._s[2099]! } + public var ShareMenu_SelectChats: String { return self._s[2102]! } + public var ChatList_Context_Unarchive: String { return self._s[2103]! } + public var MusicPlayer_VoiceNote: String { return self._s[2104]! } + public var Conversation_RestrictedText: String { return self._s[2105]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2106]! } + public var Wallet_Month_GenApril: String { return self._s[2107]! } + public var Wallet_Month_ShortMarch: String { return self._s[2108]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2109]! } + public var Cache_Videos: String { return self._s[2110]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2111]! } + public var Wallet_Month_GenFebruary: String { return self._s[2112]! } + public var FeatureDisabled_Oops: String { return self._s[2114]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2115]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0]) + return formatWithArgumentRanges(self._s[2116]!, self._r[2116]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2114]! } - public var GroupPermission_NoSendPolls: String { return self._s[2115]! } - public var Wallet_Qr_ScanCode: String { return self._s[2116]! } - public var Message_VideoExpired: String { return self._s[2118]! } - public var Notifications_Badge: String { return self._s[2119]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2120]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2121]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2122]! } - public var Username_InvalidTooShort: String { return self._s[2123]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2124]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2125]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2126]! } + public var Stickers_GroupStickersHelp: String { return self._s[2117]! } + public var GroupPermission_NoSendPolls: String { return self._s[2118]! } + public var Wallet_Qr_ScanCode: String { return self._s[2119]! } + public var Message_VideoExpired: String { return self._s[2121]! } + public var Notifications_Badge: String { return self._s[2122]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2123]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2124]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2125]! } + public var Username_InvalidTooShort: String { return self._s[2126]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2127]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2128]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2129]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2127]!, self._r[2127]!, [_1]) + return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2128]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2129]! } - public var SharedMedia_CategoryDocs: String { return self._s[2132]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2131]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2132]! } + public var SharedMedia_CategoryDocs: String { return self._s[2135]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2133]!, self._r[2133]!, [_1]) + return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2134]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2136]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2137]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2139]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_1]) + return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2138]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2141]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, [_0]) + return formatWithArgumentRanges(self._s[2142]!, self._r[2142]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2140]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2141]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2142]! } - public var Channel_UpdatePhotoItem: String { return self._s[2143]! } - public var GroupInfo_LeftStatus: String { return self._s[2144]! } - public var Watch_MessageView_Forward: String { return self._s[2146]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2147]! } - public var Cache_ClearEmpty: String { return self._s[2149]! } - public var Localization_LanguageName: String { return self._s[2150]! } - public var WebSearch_GIFs: String { return self._s[2151]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2152]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2153]! } - public var Common_Back: String { return self._s[2154]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2155]! } - public var Wallet_Send_Send: String { return self._s[2156]! } + public var ChatSettings_PrivateChats: String { return self._s[2143]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2144]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2145]! } + public var Channel_UpdatePhotoItem: String { return self._s[2146]! } + public var GroupInfo_LeftStatus: String { return self._s[2147]! } + public var Watch_MessageView_Forward: String { return self._s[2149]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2150]! } + public var Cache_ClearEmpty: String { return self._s[2152]! } + public var Localization_LanguageName: String { return self._s[2153]! } + public var WebSearch_GIFs: String { return self._s[2154]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2155]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2156]! } + public var Common_Back: String { return self._s[2157]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2158]! } + public var Wallet_Send_Send: String { return self._s[2159]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2158]! } - public var Wallet_Month_GenJune: String { return self._s[2159]! } - public var Passport_Email_Help: String { return self._s[2160]! } - public var Watch_Conversation_Reply: String { return self._s[2162]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2164]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2165]! } - public var Channel_BanUser_Unban: String { return self._s[2167]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2168]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2169]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2171]! } - public var Wallet_Send_AddressHeader: String { return self._s[2172]! } - public var Passport_Identity_Name: String { return self._s[2173]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2161]! } + public var Wallet_Month_GenJune: String { return self._s[2162]! } + public var Passport_Email_Help: String { return self._s[2163]! } + public var Watch_Conversation_Reply: String { return self._s[2165]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2167]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2168]! } + public var Channel_BanUser_Unban: String { return self._s[2170]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2171]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2172]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2174]! } + public var Wallet_Send_AddressHeader: String { return self._s[2175]! } + public var Passport_Identity_Name: String { return self._s[2176]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2174]!, self._r[2174]!, [_0]) + return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2175]! } - public var Conversation_BlockUser: String { return self._s[2176]! } - public var Month_GenJanuary: String { return self._s[2177]! } - public var ChatSettings_TextSize: String { return self._s[2178]! } - public var Notification_PassportValuePhone: String { return self._s[2179]! } - public var Passport_Language_ne: String { return self._s[2180]! } - public var Notification_CallBack: String { return self._s[2181]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2182]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2183]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2178]! } + public var Conversation_BlockUser: String { return self._s[2179]! } + public var Month_GenJanuary: String { return self._s[2180]! } + public var ChatSettings_TextSize: String { return self._s[2181]! } + public var Notification_PassportValuePhone: String { return self._s[2182]! } + public var Passport_Language_ne: String { return self._s[2183]! } + public var Notification_CallBack: String { return self._s[2184]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2185]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2186]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2184]!, self._r[2184]!, [_0]) + return formatWithArgumentRanges(self._s[2187]!, self._r[2187]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2185]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2186]! } - public var Stickers_FrequentlyUsed: String { return self._s[2187]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2188]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2190]! } + public var Channel_Info_Management: String { return self._s[2188]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2189]! } + public var Stickers_FrequentlyUsed: String { return self._s[2190]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2191]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2193]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2191]!, self._r[2191]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2194]!, self._r[2194]!, [_1, "\(_2)"]) } - public var Passport_Address_EditResidentialAddress: String { return self._s[2192]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2193]! } - public var CreatePoll_TextHeader: String { return self._s[2194]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2195]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2196]! } + public var CreatePoll_TextHeader: String { return self._s[2197]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2195]!, self._r[2195]!, [_0]) + return formatWithArgumentRanges(self._s[2198]!, self._r[2198]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2196]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2197]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2199]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2200]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2201]! } + public var PhotoEditor_QualityMedium: String { return self._s[2199]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2200]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2202]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2203]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2204]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2202]!, self._r[2202]!, [_0]) + return formatWithArgumentRanges(self._s[2205]!, self._r[2205]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2203]!, self._r[2203]!, [_1]) + return formatWithArgumentRanges(self._s[2206]!, self._r[2206]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2204]! } - public var Conversation_LinkDialogOpen: String { return self._s[2206]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2207]! } - public var Settings_Username: String { return self._s[2209]! } - public var Conversation_Block: String { return self._s[2211]! } - public var Wallpaper_Wallpaper: String { return self._s[2212]! } - public var SocksProxySetup_UseProxy: String { return self._s[2214]! } - public var Wallet_Send_Confirmation: String { return self._s[2215]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2216]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2217]! } - public var MessageTimer_Forever: String { return self._s[2218]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2219]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2220]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2221]! } - public var Passport_Language_da: String { return self._s[2222]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2223]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2207]! } + public var Conversation_LinkDialogOpen: String { return self._s[2209]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2210]! } + public var Settings_Username: String { return self._s[2212]! } + public var Conversation_Block: String { return self._s[2214]! } + public var Wallpaper_Wallpaper: String { return self._s[2215]! } + public var SocksProxySetup_UseProxy: String { return self._s[2217]! } + public var Wallet_Send_Confirmation: String { return self._s[2218]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2219]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2220]! } + public var MessageTimer_Forever: String { return self._s[2221]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2222]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2223]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2224]! } + public var Passport_Language_da: String { return self._s[2225]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2226]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2224]!, self._r[2224]!, [_0]) - } - public var Passport_Address_EditPassportRegistration: String { return self._s[2225]! } - public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2227]!, self._r[2227]!, [_0]) } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2229]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2230]! } - public var Conversation_PinnedPoll: String { return self._s[2231]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2232]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2228]! } + public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2230]!, self._r[2230]!, [_0]) + } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2232]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2233]! } + public var Conversation_PinnedPoll: String { return self._s[2234]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2235]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2233]!, self._r[2233]!, [_1]) + return formatWithArgumentRanges(self._s[2236]!, self._r[2236]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2234]! } - public var Cache_ByPeerHeader: String { return self._s[2235]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2237]! } + public var Cache_ByPeerHeader: String { return self._s[2238]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2236]!, self._r[2236]!, [_0]) + return formatWithArgumentRanges(self._s[2239]!, self._r[2239]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2237]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2240]! } - public var Wallet_Completed_Title: String { return self._s[2241]! } - public var Notification_PinnedMessage: String { return self._s[2242]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2244]! } - public var Contacts_SortBy: String { return self._s[2245]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2240]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2243]! } + public var Wallet_Completed_Title: String { return self._s[2244]! } + public var Notification_PinnedMessage: String { return self._s[2245]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2247]! } + public var Contacts_SortBy: String { return self._s[2248]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2246]!, self._r[2246]!, [_1]) + return formatWithArgumentRanges(self._s[2249]!, self._r[2249]!, [_1]) } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2248]!, self._r[2248]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2251]!, self._r[2251]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2249]! } - public var Watch_UserInfo_Service: String { return self._s[2250]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2252]! } - public var Conversation_Unpin: String { return self._s[2254]! } - public var CancelResetAccount_Title: String { return self._s[2255]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2256]! } + public var Call_EncryptionKey_Title: String { return self._s[2252]! } + public var Watch_UserInfo_Service: String { return self._s[2253]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2255]! } + public var Conversation_Unpin: String { return self._s[2257]! } + public var CancelResetAccount_Title: String { return self._s[2258]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2259]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2258]!, self._r[2258]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2261]!, self._r[2261]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2259]! } - public var CallSettings_Title: String { return self._s[2260]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2261]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2263]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2264]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2262]! } + public var CallSettings_Title: String { return self._s[2263]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2264]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2266]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2267]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2265]!, self._r[2265]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2268]!, self._r[2268]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2266]! } - public var LoginPassword_PasswordHelp: String { return self._s[2267]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2268]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2269]! } - public var Checkout_TotalPaidAmount: String { return self._s[2270]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2269]! } + public var LoginPassword_PasswordHelp: String { return self._s[2270]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2271]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2272]! } + public var Checkout_TotalPaidAmount: String { return self._s[2273]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2271]!, self._r[2271]!, [_0]) + return formatWithArgumentRanges(self._s[2274]!, self._r[2274]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2272]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2274]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2275]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2275]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2277]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2278]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2276]!, self._r[2276]!, [_1]) + return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2277]! } - public var Contacts_InviteFriends: String { return self._s[2279]! } - public var Map_ChooseLocationTitle: String { return self._s[2280]! } - public var Conversation_StopPoll: String { return self._s[2282]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2280]! } + public var Contacts_InviteFriends: String { return self._s[2282]! } + public var Map_ChooseLocationTitle: String { return self._s[2283]! } + public var Conversation_StopPoll: String { return self._s[2285]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2283]!, self._r[2283]!, [_0]) + return formatWithArgumentRanges(self._s[2286]!, self._r[2286]!, [_0]) } - public var Call_Camera: String { return self._s[2284]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2285]! } - public var Calls_RatingFeedback: String { return self._s[2286]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2287]! } - public var Wallet_Alert_OK: String { return self._s[2288]! } - public var NotificationsSound_Pulse: String { return self._s[2289]! } - public var Watch_LastSeen_Lately: String { return self._s[2290]! } - public var ReportGroupLocation_Report: String { return self._s[2293]! } - public var Widget_NoUsers: String { return self._s[2294]! } - public var Conversation_UnvotePoll: String { return self._s[2295]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2297]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2298]! } - public var NotificationsSound_Circles: String { return self._s[2299]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2302]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2303]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2304]! } - public var Proxy_TooltipUnavailable: String { return self._s[2305]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2307]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2309]! } - public var Conversation_FileDropbox: String { return self._s[2310]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2311]! } - public var Tour_Text3: String { return self._s[2313]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2315]! } - public var GroupPermission_NoSendMessages: String { return self._s[2316]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2317]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2318]! } + public var Call_Camera: String { return self._s[2287]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2288]! } + public var Calls_RatingFeedback: String { return self._s[2289]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2290]! } + public var Wallet_Alert_OK: String { return self._s[2291]! } + public var NotificationsSound_Pulse: String { return self._s[2292]! } + public var Watch_LastSeen_Lately: String { return self._s[2293]! } + public var ReportGroupLocation_Report: String { return self._s[2296]! } + public var Widget_NoUsers: String { return self._s[2297]! } + public var Conversation_UnvotePoll: String { return self._s[2298]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2300]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2301]! } + public var NotificationsSound_Circles: String { return self._s[2302]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2305]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2306]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2307]! } + public var Proxy_TooltipUnavailable: String { return self._s[2308]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2310]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2312]! } + public var Conversation_FileDropbox: String { return self._s[2313]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2314]! } + public var Tour_Text3: String { return self._s[2316]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2318]! } + public var GroupPermission_NoSendMessages: String { return self._s[2319]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2320]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2321]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2320]!, self._r[2320]!, [_0]) + return formatWithArgumentRanges(self._s[2323]!, self._r[2323]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2321]! } - public var Checkout_ShippingOption_Title: String { return self._s[2322]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2323]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2324]! } + public var Checkout_ShippingOption_Title: String { return self._s[2325]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2326]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_0]) + return formatWithArgumentRanges(self._s[2327]!, self._r[2327]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2325]!, self._r[2325]!, [_0]) + return formatWithArgumentRanges(self._s[2328]!, self._r[2328]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2326]! } - public var EditTheme_FileReadError: String { return self._s[2327]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2328]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2329]! } - public var AutoDownloadSettings_Photos: String { return self._s[2331]! } - public var Appearance_PreviewIncomingText: String { return self._s[2332]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2333]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2334]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2335]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2336]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2337]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2338]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2339]! } - public var Notification_SecretChatScreenshot: String { return self._s[2340]! } - public var AccessDenied_Wallpapers: String { return self._s[2341]! } - public var ChatList_Context_Mute: String { return self._s[2343]! } - public var Passport_Address_City: String { return self._s[2344]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2345]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2346]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2347]! } - public var AccessDenied_LocationDisabled: String { return self._s[2348]! } - public var Group_Location_Title: String { return self._s[2349]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2351]! } - public var GroupInfo_Sound: String { return self._s[2352]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2353]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2354]! } - public var Contacts_Title: String { return self._s[2355]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2356]! } - public var Passport_Language_fr: String { return self._s[2357]! } - public var Notifications_ResetAllNotifications: String { return self._s[2358]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2361]! } - public var Checkout_NewCard_Title: String { return self._s[2362]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2363]! } - public var Conversation_ForwardChats: String { return self._s[2364]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2366]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2367]! } - public var Settings_FAQ: String { return self._s[2369]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2370]! } - public var Conversation_ContextMenuForward: String { return self._s[2371]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2374]! } - public var PrivacyPolicy_Title: String { return self._s[2377]! } - public var Notifications_TextTone: String { return self._s[2378]! } - public var Profile_CreateNewContact: String { return self._s[2379]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2380]! } - public var Call_Speaker: String { return self._s[2382]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2383]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2385]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2386]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2329]! } + public var EditTheme_FileReadError: String { return self._s[2330]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2331]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2332]! } + public var AutoDownloadSettings_Photos: String { return self._s[2334]! } + public var Appearance_PreviewIncomingText: String { return self._s[2335]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2336]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2337]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2338]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2339]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2340]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2341]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2342]! } + public var Notification_SecretChatScreenshot: String { return self._s[2343]! } + public var AccessDenied_Wallpapers: String { return self._s[2344]! } + public var ChatList_Context_Mute: String { return self._s[2346]! } + public var Passport_Address_City: String { return self._s[2347]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2348]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2349]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2350]! } + public var AccessDenied_LocationDisabled: String { return self._s[2351]! } + public var Group_Location_Title: String { return self._s[2352]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2354]! } + public var GroupInfo_Sound: String { return self._s[2355]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2356]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2357]! } + public var Contacts_Title: String { return self._s[2358]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2359]! } + public var Passport_Language_fr: String { return self._s[2360]! } + public var Notifications_ResetAllNotifications: String { return self._s[2361]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2364]! } + public var Checkout_NewCard_Title: String { return self._s[2365]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2366]! } + public var Conversation_ForwardChats: String { return self._s[2367]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2369]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2370]! } + public var Settings_FAQ: String { return self._s[2372]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2373]! } + public var Conversation_ContextMenuForward: String { return self._s[2374]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2377]! } + public var PrivacyPolicy_Title: String { return self._s[2380]! } + public var Notifications_TextTone: String { return self._s[2381]! } + public var Profile_CreateNewContact: String { return self._s[2382]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2383]! } + public var Call_Speaker: String { return self._s[2385]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2386]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2388]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2389]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2387]!, self._r[2387]!, [_0]) + return formatWithArgumentRanges(self._s[2390]!, self._r[2390]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2388]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2389]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2390]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2391]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2392]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2393]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2394]! } - public var Bot_Unblock: String { return self._s[2395]! } - public var TextFormat_Italic: String { return self._s[2396]! } - public var WallpaperSearch_ColorPink: String { return self._s[2397]! } - public var Settings_About_Help: String { return self._s[2398]! } - public var SearchImages_Title: String { return self._s[2399]! } - public var Weekday_Wednesday: String { return self._s[2400]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2401]! } - public var ExplicitContent_AlertTitle: String { return self._s[2402]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2391]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2392]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2393]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2394]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2395]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2396]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2397]! } + public var Bot_Unblock: String { return self._s[2398]! } + public var TextFormat_Italic: String { return self._s[2399]! } + public var WallpaperSearch_ColorPink: String { return self._s[2400]! } + public var Settings_About_Help: String { return self._s[2401]! } + public var SearchImages_Title: String { return self._s[2402]! } + public var Weekday_Wednesday: String { return self._s[2403]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2404]! } + public var ExplicitContent_AlertTitle: String { return self._s[2405]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2403]!, self._r[2403]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2406]!, self._r[2406]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2404]! } - public var Weekday_Thursday: String { return self._s[2405]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2406]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2407]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2407]! } + public var Weekday_Thursday: String { return self._s[2408]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2409]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2410]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0]) + return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2409]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2410]! } - public var Passport_RequestedInformation: String { return self._s[2411]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2412]! } - public var Conversation_EncryptionProcessing: String { return self._s[2414]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2415]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2417]! } - public var Channel_Setup_Title: String { return self._s[2418]! } - public var Conversation_SearchPlaceholder: String { return self._s[2419]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2420]! } - public var Checkout_ErrorGeneric: String { return self._s[2421]! } - public var Passport_Language_hu: String { return self._s[2422]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2423]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2412]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2413]! } + public var Passport_RequestedInformation: String { return self._s[2414]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2415]! } + public var Conversation_EncryptionProcessing: String { return self._s[2417]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2418]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2420]! } + public var Channel_Setup_Title: String { return self._s[2421]! } + public var Conversation_SearchPlaceholder: String { return self._s[2422]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2423]! } + public var Checkout_ErrorGeneric: String { return self._s[2424]! } + public var Passport_Language_hu: String { return self._s[2425]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2426]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2425]!, self._r[2425]!, [_0]) + return formatWithArgumentRanges(self._s[2428]!, self._r[2428]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2428]!, self._r[2428]!, [_1]) + return formatWithArgumentRanges(self._s[2431]!, self._r[2431]!, [_1]) } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2432]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2429]!, self._r[2429]!, [_0]) + return formatWithArgumentRanges(self._s[2433]!, self._r[2433]!, [_0]) } - public var Group_Location_Info: String { return self._s[2430]! } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2431]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2432]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2433]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2434]! } + public var Group_Location_Info: String { return self._s[2435]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2436]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2437]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2434]!, self._r[2434]!, [_0]) + return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2435]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2436]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2437]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2438]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2439]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2440]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2441]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2442]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2439]!, self._r[2439]!, [_0]) + return formatWithArgumentRanges(self._s[2443]!, self._r[2443]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2440]! } - public var Message_PinnedAnimationMessage: String { return self._s[2442]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2444]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2445]! } - public var Wallet_Info_TransactionTo: String { return self._s[2447]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2448]! } - public var Embed_PlayingInPIP: String { return self._s[2449]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2450]! } + public var Passport_Language_cs: String { return self._s[2444]! } + public var Message_PinnedAnimationMessage: String { return self._s[2446]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2448]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2449]! } + public var Wallet_Info_TransactionTo: String { return self._s[2451]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2452]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2453]! } + public var Embed_PlayingInPIP: String { return self._s[2454]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2455]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_0]) + return formatWithArgumentRanges(self._s[2456]!, self._r[2456]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2452]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2457]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2453]!, self._r[2453]!, [_1]) + return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2454]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2455]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2456]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2457]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2458]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2459]! } + public var Notification_PaymentSent: String { return self._s[2459]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2460]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2461]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2462]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2463]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2464]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2462]!, self._r[2462]!, [_1]) + return formatWithArgumentRanges(self._s[2467]!, self._r[2467]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2463]!, self._r[2463]!, [_1]) + return formatWithArgumentRanges(self._s[2468]!, self._r[2468]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2464]!, self._r[2464]!, [_1]) + return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2466]! } - public var PasscodeSettings_HelpTop: String { return self._s[2467]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2468]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2469]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2470]! } - public var EditTheme_ShortLink: String { return self._s[2471]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2472]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2473]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2474]! } - public var Call_Accept: String { return self._s[2476]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2477]! } - public var Month_GenMarch: String { return self._s[2479]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2480]! } - public var LoginPassword_Title: String { return self._s[2481]! } - public var Call_End: String { return self._s[2482]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2483]! } - public var VoiceOver_Chat_Contact: String { return self._s[2484]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2485]! } - public var CallSettings_Always: String { return self._s[2486]! } - public var CallFeedback_Success: String { return self._s[2487]! } - public var TwoStepAuth_SetupHint: String { return self._s[2488]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2471]! } + public var PasscodeSettings_HelpTop: String { return self._s[2472]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2473]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2474]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2475]! } + public var EditTheme_ShortLink: String { return self._s[2476]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2477]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2478]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2479]! } + public var Call_Accept: String { return self._s[2481]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2482]! } + public var Month_GenMarch: String { return self._s[2484]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2485]! } + public var LoginPassword_Title: String { return self._s[2486]! } + public var Call_End: String { return self._s[2487]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2488]! } + public var VoiceOver_Chat_Contact: String { return self._s[2489]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2490]! } + public var CallSettings_Always: String { return self._s[2491]! } + public var CallFeedback_Success: String { return self._s[2492]! } + public var TwoStepAuth_SetupHint: String { return self._s[2493]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2489]!, self._r[2489]!, [_1]) + return formatWithArgumentRanges(self._s[2494]!, self._r[2494]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2490]! } - public var Login_PhoneTitle: String { return self._s[2491]! } - public var Passport_FieldPhoneHelp: String { return self._s[2492]! } - public var Weekday_ShortSunday: String { return self._s[2493]! } - public var Passport_InfoFAQ_URL: String { return self._s[2494]! } - public var ContactInfo_Job: String { return self._s[2496]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2497]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2498]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2499]! } - public var Invite_ChannelsTooMuch: String { return self._s[2500]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2501]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2502]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2503]! } - public var Wallet_Receive_AmountText: String { return self._s[2504]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2505]! } - public var CallFeedback_ReasonNoise: String { return self._s[2506]! } - public var Appearance_AppIconDefault: String { return self._s[2508]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2509]! } - public var MediaPicker_AddCaption: String { return self._s[2510]! } - public var CallSettings_TabIconDescription: String { return self._s[2511]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2495]! } + public var Login_PhoneTitle: String { return self._s[2496]! } + public var Passport_FieldPhoneHelp: String { return self._s[2497]! } + public var Weekday_ShortSunday: String { return self._s[2498]! } + public var Passport_InfoFAQ_URL: String { return self._s[2499]! } + public var ContactInfo_Job: String { return self._s[2501]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2502]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2503]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2504]! } + public var Invite_ChannelsTooMuch: String { return self._s[2505]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2506]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2507]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2508]! } + public var Wallet_Receive_AmountText: String { return self._s[2509]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2510]! } + public var CallFeedback_ReasonNoise: String { return self._s[2511]! } + public var Appearance_AppIconDefault: String { return self._s[2513]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2514]! } + public var MediaPicker_AddCaption: String { return self._s[2515]! } + public var CallSettings_TabIconDescription: String { return self._s[2516]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2512]!, self._r[2512]!, [_0]) + return formatWithArgumentRanges(self._s[2517]!, self._r[2517]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2513]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2514]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2515]! } - public var DialogList_SearchSectionRecent: String { return self._s[2516]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2517]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2520]! } - public var LastSeen_WithinAWeek: String { return self._s[2521]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2522]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2524]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2525]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2518]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2519]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2520]! } + public var DialogList_SearchSectionRecent: String { return self._s[2521]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2522]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2525]! } + public var LastSeen_WithinAWeek: String { return self._s[2526]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2527]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2529]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2530]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2526]!, self._r[2526]!, [_0]) + return formatWithArgumentRanges(self._s[2531]!, self._r[2531]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2527]! } - public var Conversation_StatusLeftGroup: String { return self._s[2528]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2529]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2531]! } - public var GroupPermission_AddSuccess: String { return self._s[2532]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2534]! } - public var Conversation_ContextMenuCopy: String { return self._s[2535]! } - public var AccessDenied_CallMicrophone: String { return self._s[2536]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2532]! } + public var Conversation_StatusLeftGroup: String { return self._s[2533]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2534]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2536]! } + public var GroupPermission_AddSuccess: String { return self._s[2537]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2539]! } + public var Conversation_ContextMenuCopy: String { return self._s[2540]! } + public var AccessDenied_CallMicrophone: String { return self._s[2541]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2537]!, self._r[2537]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2538]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2539]! } - public var Checkout_PaymentMethod_New: String { return self._s[2540]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2541]! } - public var PhotoEditor_QualityTool: String { return self._s[2542]! } - public var Login_SendCodeViaSms: String { return self._s[2543]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2544]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2545]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2546]! } - public var Login_EmailNotConfiguredError: String { return self._s[2547]! } - public var SocksProxySetup_Status: String { return self._s[2548]! } - public var PrivacyPolicy_Accept: String { return self._s[2549]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2550]! } - public var Appearance_AppIconClassicX: String { return self._s[2551]! } + public var Login_InvalidFirstNameError: String { return self._s[2543]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2544]! } + public var Checkout_PaymentMethod_New: String { return self._s[2545]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2546]! } + public var PhotoEditor_QualityTool: String { return self._s[2547]! } + public var Login_SendCodeViaSms: String { return self._s[2548]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2549]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2550]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2551]! } + public var Login_EmailNotConfiguredError: String { return self._s[2552]! } + public var SocksProxySetup_Status: String { return self._s[2553]! } + public var PrivacyPolicy_Accept: String { return self._s[2554]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2555]! } + public var Appearance_AppIconClassicX: String { return self._s[2556]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2552]!, self._r[2552]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2557]!, self._r[2557]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2553]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2555]! } - public var AutoNightTheme_Automatic: String { return self._s[2556]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2557]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2558]! } - public var Cache_Help: String { return self._s[2559]! } - public var Group_ErrorAccessDenied: String { return self._s[2560]! } - public var Passport_Language_fa: String { return self._s[2561]! } - public var Wallet_Intro_Text: String { return self._s[2562]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2563]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2564]! } - public var PrivacySettings_LastSeen: String { return self._s[2565]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2558]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2560]! } + public var AutoNightTheme_Automatic: String { return self._s[2561]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2562]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2563]! } + public var Cache_Help: String { return self._s[2564]! } + public var Group_ErrorAccessDenied: String { return self._s[2565]! } + public var Passport_Language_fa: String { return self._s[2566]! } + public var Wallet_Intro_Text: String { return self._s[2567]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2568]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2569]! } + public var PrivacySettings_LastSeen: String { return self._s[2570]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2566]!, self._r[2566]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2571]!, self._r[2571]!, [_0, _1]) } - public var Preview_SaveGif: String { return self._s[2570]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2571]! } - public var Profile_About: String { return self._s[2572]! } - public var Channel_About_Placeholder: String { return self._s[2573]! } - public var Login_InfoTitle: String { return self._s[2574]! } + public var Preview_SaveGif: String { return self._s[2575]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2576]! } + public var Profile_About: String { return self._s[2577]! } + public var Channel_About_Placeholder: String { return self._s[2578]! } + public var Login_InfoTitle: String { return self._s[2579]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2575]!, self._r[2575]!, [_0]) + return formatWithArgumentRanges(self._s[2580]!, self._r[2580]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2576]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2578]! } - public var ContactInfo_Title: String { return self._s[2579]! } - public var Media_ShareThisVideo: String { return self._s[2580]! } - public var Weekday_ShortFriday: String { return self._s[2581]! } - public var AccessDenied_Contacts: String { return self._s[2583]! } - public var Notification_CallIncomingShort: String { return self._s[2584]! } - public var Group_Setup_TypePublic: String { return self._s[2585]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2586]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2587]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2590]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2591]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2592]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2593]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2594]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2581]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2583]! } + public var ContactInfo_Title: String { return self._s[2584]! } + public var Media_ShareThisVideo: String { return self._s[2585]! } + public var Weekday_ShortFriday: String { return self._s[2586]! } + public var AccessDenied_Contacts: String { return self._s[2588]! } + public var Notification_CallIncomingShort: String { return self._s[2589]! } + public var Group_Setup_TypePublic: String { return self._s[2590]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2591]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2592]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2595]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2596]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2597]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2598]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2599]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2595]!, self._r[2595]!, [_0]) + return formatWithArgumentRanges(self._s[2600]!, self._r[2600]!, [_0]) } - public var DialogList_Typing: String { return self._s[2596]! } - public var CallFeedback_IncludeLogs: String { return self._s[2598]! } - public var Checkout_Phone: String { return self._s[2600]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2603]! } - public var Privacy_Calls_Integration: String { return self._s[2604]! } - public var Notifications_PermissionsAllow: String { return self._s[2605]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2609]! } - public var Settings_ChatSettings: String { return self._s[2610]! } + public var DialogList_Typing: String { return self._s[2601]! } + public var CallFeedback_IncludeLogs: String { return self._s[2603]! } + public var Checkout_Phone: String { return self._s[2605]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2608]! } + public var Privacy_Calls_Integration: String { return self._s[2609]! } + public var Notifications_PermissionsAllow: String { return self._s[2610]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2614]! } + public var Settings_ChatSettings: String { return self._s[2615]! } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2611]!, self._r[2611]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2613]! } + public var GroupRemoved_DeleteUser: String { return self._s[2618]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2614]!, self._r[2614]!, [_0]) + return formatWithArgumentRanges(self._s[2619]!, self._r[2619]!, [_0]) } - public var Wallet_TransactionInfo_FeeInfoURL: String { return self._s[2615]! } + public var Wallet_TransactionInfo_FeeInfoURL: String { return self._s[2620]! } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_1]) + return formatWithArgumentRanges(self._s[2621]!, self._r[2621]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2617]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2618]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2620]! } - public var Conversation_Unblock: String { return self._s[2621]! } - public var PrivacySettings_DataSettings: String { return self._s[2622]! } - public var Group_PublicLink_Info: String { return self._s[2623]! } + public var Login_ContinueWithLocalization: String { return self._s[2622]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2623]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2625]! } + public var Conversation_Unblock: String { return self._s[2626]! } + public var PrivacySettings_DataSettings: String { return self._s[2627]! } + public var Group_PublicLink_Info: String { return self._s[2628]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2624]!, self._r[2624]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2625]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2630]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2626]!, self._r[2626]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0, _1]) } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2628]! } - public var PrivacySettings_Passcode: String { return self._s[2630]! } - public var Call_Mute: String { return self._s[2631]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2632]! } - public var Passport_Language_dz: String { return self._s[2633]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2634]! } - public var Passport_Language_tk: String { return self._s[2635]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2633]! } + public var PrivacySettings_Passcode: String { return self._s[2635]! } + public var Call_Mute: String { return self._s[2636]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2637]! } + public var Passport_Language_dz: String { return self._s[2638]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2639]! } + public var Passport_Language_tk: String { return self._s[2640]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2636]!, self._r[2636]!, [_0]) + return formatWithArgumentRanges(self._s[2641]!, self._r[2641]!, [_0]) } - public var Settings_Search: String { return self._s[2637]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2638]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2639]! } - public var Conversation_ContextMenuReply: String { return self._s[2640]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2641]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2642]! } - public var Tour_Title1: String { return self._s[2643]! } - public var Wallet_Alert_Cancel: String { return self._s[2644]! } - public var Conversation_ClearGroupHistory: String { return self._s[2646]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2647]! } - public var WallpaperPreview_Motion: String { return self._s[2648]! } + public var Settings_Search: String { return self._s[2642]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2643]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2644]! } + public var Conversation_ContextMenuReply: String { return self._s[2645]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2646]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2647]! } + public var Tour_Title1: String { return self._s[2648]! } + public var Wallet_Alert_Cancel: String { return self._s[2649]! } + public var Conversation_ClearGroupHistory: String { return self._s[2651]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2652]! } + public var WallpaperPreview_Motion: String { return self._s[2653]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_0]) + return formatWithArgumentRanges(self._s[2654]!, self._r[2654]!, [_0]) } - public var Call_RateCall: String { return self._s[2650]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2651]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2652]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2653]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2655]! } + public var Call_RateCall: String { return self._s[2655]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2656]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2657]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2658]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2660]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2657]!, self._r[2657]!, [_0]) + return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_0]) } - public var Compose_Create: String { return self._s[2658]! } - public var Contacts_InviteToTelegram: String { return self._s[2659]! } - public var GroupInfo_Notifications: String { return self._s[2660]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2662]! } - public var Month_GenApril: String { return self._s[2663]! } - public var Appearance_AutoNightTheme: String { return self._s[2664]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2666]! } - public var Login_CodeSentSms: String { return self._s[2668]! } + public var Compose_Create: String { return self._s[2663]! } + public var Contacts_InviteToTelegram: String { return self._s[2664]! } + public var GroupInfo_Notifications: String { return self._s[2665]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2667]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2668]! } + public var Month_GenApril: String { return self._s[2669]! } + public var Appearance_AutoNightTheme: String { return self._s[2670]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2672]! } + public var Login_CodeSentSms: String { return self._s[2674]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2669]!, self._r[2669]!, [_0]) + return formatWithArgumentRanges(self._s[2675]!, self._r[2675]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2670]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2671]! } - public var Passport_Language_hr: String { return self._s[2672]! } - public var Common_ActionNotAllowedError: String { return self._s[2673]! } + public var EmptyGroupInfo_Line3: String { return self._s[2676]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2677]! } + public var Passport_Language_hr: String { return self._s[2678]! } + public var Common_ActionNotAllowedError: String { return self._s[2679]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2674]!, self._r[2674]!, [_0]) + return formatWithArgumentRanges(self._s[2680]!, self._r[2680]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2675]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2676]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2677]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2678]! } - public var Privacy_SecretChatsTitle: String { return self._s[2679]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2681]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2682]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2683]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2684]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2685]! } - public var Preview_DeleteGif: String { return self._s[2686]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2687]! } - public var Group_ErrorNotMutualContact: String { return self._s[2688]! } - public var Notification_MessageLifetime5s: String { return self._s[2689]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2681]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2682]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2683]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2684]! } + public var Privacy_SecretChatsTitle: String { return self._s[2685]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2687]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2688]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2689]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2690]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2691]! } + public var Preview_DeleteGif: String { return self._s[2692]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2693]! } + public var Group_ErrorNotMutualContact: String { return self._s[2694]! } + public var Notification_MessageLifetime5s: String { return self._s[2695]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2690]!, self._r[2690]!, [_0]) + return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2691]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2693]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2694]! } - public var Passport_Address_AddBankStatement: String { return self._s[2695]! } - public var Notification_CallIncoming: String { return self._s[2696]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2697]! } - public var Compose_NewGroupTitle: String { return self._s[2698]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2700]! } - public var Passport_Address_Postcode: String { return self._s[2702]! } + public var VoiceOver_Chat_Video: String { return self._s[2697]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2699]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2700]! } + public var Passport_Address_AddBankStatement: String { return self._s[2701]! } + public var Notification_CallIncoming: String { return self._s[2702]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2703]! } + public var Compose_NewGroupTitle: String { return self._s[2704]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2706]! } + public var Passport_Address_Postcode: String { return self._s[2708]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2703]!, self._r[2703]!, [_0]) + return formatWithArgumentRanges(self._s[2709]!, self._r[2709]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2704]! } - public var Wallet_Month_ShortOctober: String { return self._s[2705]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2706]! } - public var WallpaperColors_Title: String { return self._s[2707]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2708]! } - public var VoiceOver_MessageContextForward: String { return self._s[2709]! } - public var GroupPermission_Duration: String { return self._s[2710]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2710]! } + public var Wallet_Month_ShortOctober: String { return self._s[2711]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2712]! } + public var WallpaperColors_Title: String { return self._s[2713]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2714]! } + public var VoiceOver_MessageContextForward: String { return self._s[2715]! } + public var GroupPermission_Duration: String { return self._s[2716]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_0]) + return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2712]! } - public var Username_Placeholder: String { return self._s[2713]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2714]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2715]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2716]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2718]! } + public var Username_Placeholder: String { return self._s[2719]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2720]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2721]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2722]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2724]!, self._r[2724]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2719]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2720]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2721]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2722]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2723]! } - public var Conversation_ContextMenuMore: String { return self._s[2724]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2725]! } - public var CallSettings_TabIcon: String { return self._s[2726]! } - public var KeyCommand_Find: String { return self._s[2727]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2728]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2729]! } - public var Message_PinnedGame: String { return self._s[2730]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2731]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2733]! } - public var Login_CallRequestState2: String { return self._s[2735]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2737]! } + public var Passport_PasswordDescription: String { return self._s[2725]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2726]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2727]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2728]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2729]! } + public var Conversation_ContextMenuMore: String { return self._s[2730]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2731]! } + public var CallSettings_TabIcon: String { return self._s[2732]! } + public var KeyCommand_Find: String { return self._s[2733]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2734]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2735]! } + public var Message_PinnedGame: String { return self._s[2736]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2737]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2739]! } + public var Login_CallRequestState2: String { return self._s[2741]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2743]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2738]!, self._r[2738]!, [_0]) + return formatWithArgumentRanges(self._s[2744]!, self._r[2744]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2740]!, self._r[2740]!, [_0]) + return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_0]) } - public var WallpaperPreview_Blurred: String { return self._s[2741]! } - public var Conversation_InstantPagePreview: String { return self._s[2742]! } + public var WallpaperPreview_Blurred: String { return self._s[2747]! } + public var Conversation_InstantPagePreview: String { return self._s[2748]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2743]!, self._r[2743]!, [_0]) + return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2746]! } - public var WallpaperSearch_ColorRed: String { return self._s[2747]! } - public var GroupPermission_NoPinMessages: String { return self._s[2748]! } - public var Passport_Language_es: String { return self._s[2749]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2751]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2752]! } + public var SecretTimer_VideoDescription: String { return self._s[2752]! } + public var WallpaperSearch_ColorRed: String { return self._s[2753]! } + public var GroupPermission_NoPinMessages: String { return self._s[2754]! } + public var Passport_Language_es: String { return self._s[2755]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2757]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2758]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2753]!, self._r[2753]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2754]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2755]! } - public var Watch_UserInfo_Unmute: String { return self._s[2756]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2757]! } - public var AccessDenied_CameraRestricted: String { return self._s[2759]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2760]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2761]! } + public var Watch_UserInfo_Unmute: String { return self._s[2762]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2763]! } + public var AccessDenied_CameraRestricted: String { return self._s[2765]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2760]!, self._r[2760]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2762]! } - public var Settings_CopyUsername: String { return self._s[2763]! } - public var Contacts_SearchLabel: String { return self._s[2764]! } - public var Map_OpenInYandexNavigator: String { return self._s[2766]! } - public var PasscodeSettings_EncryptData: String { return self._s[2767]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2768]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2769]! } - public var DialogList_AdNoticeAlert: String { return self._s[2770]! } - public var Wallet_Month_GenMay: String { return self._s[2772]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2773]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2774]! } - public var Localization_LanguageCustom: String { return self._s[2775]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2776]! } - public var CallFeedback_Title: String { return self._s[2777]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2780]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2781]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2782]! } - public var Conversation_InfoGroup: String { return self._s[2783]! } - public var Compose_NewMessage: String { return self._s[2784]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2785]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2786]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2787]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2788]! } + public var ChatList_ReadAll: String { return self._s[2768]! } + public var Settings_CopyUsername: String { return self._s[2769]! } + public var Contacts_SearchLabel: String { return self._s[2770]! } + public var Map_OpenInYandexNavigator: String { return self._s[2772]! } + public var PasscodeSettings_EncryptData: String { return self._s[2773]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2774]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2775]! } + public var DialogList_AdNoticeAlert: String { return self._s[2776]! } + public var Wallet_Month_GenMay: String { return self._s[2778]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2779]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2780]! } + public var Localization_LanguageCustom: String { return self._s[2781]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2782]! } + public var CallFeedback_Title: String { return self._s[2783]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2786]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2787]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2788]! } + public var Conversation_InfoGroup: String { return self._s[2789]! } + public var Compose_NewMessage: String { return self._s[2790]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2791]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2792]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2793]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2794]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_0]) + return formatWithArgumentRanges(self._s[2795]!, self._r[2795]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2790]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2791]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2792]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2793]! } - public var Channel_BlackList_Title: String { return self._s[2794]! } - public var UserInfo_PhoneCall: String { return self._s[2795]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2797]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2798]! } - public var State_connecting: String { return self._s[2799]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2800]! } - public var Wallet_Month_GenMarch: String { return self._s[2801]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2802]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2796]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2797]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2798]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2799]! } + public var Channel_BlackList_Title: String { return self._s[2800]! } + public var UserInfo_PhoneCall: String { return self._s[2801]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2803]! } + public var Wallet_Month_ShortJanuary: String { return self._s[2804]! } + public var State_connecting: String { return self._s[2805]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2806]! } + public var Wallet_Month_GenMarch: String { return self._s[2807]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2808]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2803]!, self._r[2803]!, [_0]) + return formatWithArgumentRanges(self._s[2809]!, self._r[2809]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) + return formatWithArgumentRanges(self._s[2810]!, self._r[2810]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2805]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2806]! } - public var Passport_Identity_EditPassport: String { return self._s[2807]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2809]! } - public var Localization_EnglishLanguageName: String { return self._s[2810]! } - public var Share_AuthDescription: String { return self._s[2811]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2812]! } - public var Passport_Identity_Surname: String { return self._s[2813]! } - public var Compose_TokenListPlaceholder: String { return self._s[2814]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2815]! } - public var Settings_AboutEmpty: String { return self._s[2816]! } - public var Conversation_Unmute: String { return self._s[2817]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2819]! } - public var Wallet_Sending_Text: String { return self._s[2820]! } + public var Notifications_GroupNotifications: String { return self._s[2811]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2812]! } + public var Passport_Identity_EditPassport: String { return self._s[2813]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2815]! } + public var Localization_EnglishLanguageName: String { return self._s[2816]! } + public var Share_AuthDescription: String { return self._s[2817]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2818]! } + public var Passport_Identity_Surname: String { return self._s[2819]! } + public var Compose_TokenListPlaceholder: String { return self._s[2820]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2821]! } + public var Settings_AboutEmpty: String { return self._s[2822]! } + public var Conversation_Unmute: String { return self._s[2823]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2825]! } + public var Wallet_Sending_Text: String { return self._s[2826]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_1]) + return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2822]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2824]! } - public var ChatSettings_Appearance: String { return self._s[2825]! } - public var Appearance_PickAccentColor: String { return self._s[2826]! } + public var Login_CodeSentCall: String { return self._s[2828]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2830]! } + public var ChatSettings_Appearance: String { return self._s[2831]! } + public var Appearance_PickAccentColor: String { return self._s[2832]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2833]!, self._r[2833]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2828]!, self._r[2828]!, [_1]) + return formatWithArgumentRanges(self._s[2834]!, self._r[2834]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2829]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2830]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2831]! } - public var Wallet_Month_GenOctober: String { return self._s[2833]! } - public var ChatAdmins_AdminLabel: String { return self._s[2834]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2835]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2837]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2838]! } - public var Month_GenJune: String { return self._s[2839]! } - public var Watch_Location_Current: String { return self._s[2840]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2841]! } - public var Conversation_TitleMute: String { return self._s[2842]! } + public var Notification_CallMissed: String { return self._s[2835]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2836]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2837]! } + public var Wallet_Month_GenOctober: String { return self._s[2839]! } + public var ChatAdmins_AdminLabel: String { return self._s[2840]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2841]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2843]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2844]! } + public var Month_GenJune: String { return self._s[2845]! } + public var Watch_Location_Current: String { return self._s[2846]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2847]! } + public var Conversation_TitleMute: String { return self._s[2848]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2843]!, self._r[2843]!, [_1]) + return formatWithArgumentRanges(self._s[2849]!, self._r[2849]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2844]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2850]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2845]!, self._r[2845]!, [_0]) + return formatWithArgumentRanges(self._s[2851]!, self._r[2851]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2846]! } - public var Chat_SlowmodeSendError: String { return self._s[2847]! } - public var MaskStickerSettings_Info: String { return self._s[2848]! } - public var EditTheme_Expand_TopInfo: String { return self._s[2849]! } + public var Call_ReportPlaceholder: String { return self._s[2852]! } + public var Chat_SlowmodeSendError: String { return self._s[2853]! } + public var MaskStickerSettings_Info: String { return self._s[2854]! } + public var EditTheme_Expand_TopInfo: String { return self._s[2855]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2850]!, self._r[2850]!, [_0]) + return formatWithArgumentRanges(self._s[2856]!, self._r[2856]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2851]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2853]! } - public var Contacts_ShareTelegram: String { return self._s[2854]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2855]! } - public var Channel_ErrorAccessDenied: String { return self._s[2856]! } - public var UserInfo_ScamBotWarning: String { return self._s[2858]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2859]! } - public var Call_ConnectionErrorTitle: String { return self._s[2860]! } - public var UserInfo_NotificationsEnable: String { return self._s[2861]! } - public var ArchivedChats_IntroText1: String { return self._s[2862]! } - public var Tour_Text4: String { return self._s[2865]! } - public var WallpaperSearch_Recent: String { return self._s[2866]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[2867]! } - public var Profile_MessageLifetime2s: String { return self._s[2869]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2870]! } - public var Notification_MessageLifetime2s: String { return self._s[2871]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2857]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2859]! } + public var Contacts_ShareTelegram: String { return self._s[2860]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2861]! } + public var Channel_ErrorAccessDenied: String { return self._s[2862]! } + public var UserInfo_ScamBotWarning: String { return self._s[2864]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2865]! } + public var Call_ConnectionErrorTitle: String { return self._s[2866]! } + public var UserInfo_NotificationsEnable: String { return self._s[2867]! } + public var ArchivedChats_IntroText1: String { return self._s[2868]! } + public var Tour_Text4: String { return self._s[2871]! } + public var WallpaperSearch_Recent: String { return self._s[2872]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[2873]! } + public var Profile_MessageLifetime2s: String { return self._s[2875]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2876]! } + public var Notification_MessageLifetime2s: String { return self._s[2877]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2872]!, self._r[2872]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2878]!, self._r[2878]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2873]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2874]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2875]! } + public var Cache_ClearCache: String { return self._s[2879]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2880]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2881]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2879]!, self._r[2879]!, [_0]) + return formatWithArgumentRanges(self._s[2885]!, self._r[2885]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2881]!, self._r[2881]!, [_0]) + return formatWithArgumentRanges(self._s[2887]!, self._r[2887]!, [_0]) } - public var LocalGroup_Text: String { return self._s[2882]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2883]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2884]! } - public var ChatList_UnarchiveAction: String { return self._s[2885]! } - public var AutoNightTheme_Title: String { return self._s[2886]! } - public var InstantPage_FeedbackButton: String { return self._s[2887]! } - public var Passport_FieldAddress: String { return self._s[2888]! } + public var LocalGroup_Text: String { return self._s[2888]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2889]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2890]! } + public var ChatList_UnarchiveAction: String { return self._s[2891]! } + public var AutoNightTheme_Title: String { return self._s[2892]! } + public var InstantPage_FeedbackButton: String { return self._s[2893]! } + public var Passport_FieldAddress: String { return self._s[2894]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2889]!, self._r[2889]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2895]!, self._r[2895]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[2890]! } + public var Month_ShortMarch: String { return self._s[2896]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2891]!, self._r[2891]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2897]!, self._r[2897]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2892]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2893]! } - public var Passport_FloodError: String { return self._s[2894]! } - public var SecretGif_Title: String { return self._s[2895]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2896]! } - public var ChatList_Context_UnhideArchive: String { return self._s[2897]! } - public var Passport_Language_th: String { return self._s[2899]! } - public var Passport_Address_Address: String { return self._s[2900]! } - public var Login_InvalidLastNameError: String { return self._s[2901]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[2902]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[2903]! } - public var ChatList_Context_Archive: String { return self._s[2904]! } - public var SettingsSearch_FAQ: String { return self._s[2905]! } - public var ShareMenu_Send: String { return self._s[2906]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2908]! } - public var Month_GenNovember: String { return self._s[2910]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2912]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2898]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2899]! } + public var Passport_FloodError: String { return self._s[2900]! } + public var SecretGif_Title: String { return self._s[2901]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2902]! } + public var ChatList_Context_UnhideArchive: String { return self._s[2903]! } + public var Passport_Language_th: String { return self._s[2905]! } + public var Passport_Address_Address: String { return self._s[2906]! } + public var Login_InvalidLastNameError: String { return self._s[2907]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2908]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2909]! } + public var ChatList_Context_Archive: String { return self._s[2910]! } + public var SettingsSearch_FAQ: String { return self._s[2911]! } + public var ShareMenu_Send: String { return self._s[2912]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2914]! } + public var Month_GenNovember: String { return self._s[2916]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2918]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2913]!, self._r[2913]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2919]!, self._r[2919]!, [_1, _2]) } - public var Checkout_Email: String { return self._s[2914]! } - public var NotificationsSound_Tritone: String { return self._s[2915]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[2917]! } - public var Wallet_ContextMenuCopy: String { return self._s[2919]! } + public var Checkout_Email: String { return self._s[2920]! } + public var NotificationsSound_Tritone: String { return self._s[2921]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2923]! } + public var Wallet_ContextMenuCopy: String { return self._s[2925]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2921]!, self._r[2921]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_1, _2, _3]) } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2922]!, self._r[2922]!, [_1]) + return formatWithArgumentRanges(self._s[2928]!, self._r[2928]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[2923]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2929]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2924]!, self._r[2924]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[2930]!, self._r[2930]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[2925]! } - public var Notification_Exceptions_Add: String { return self._s[2926]! } - public var DialogList_You: String { return self._s[2927]! } - public var MediaPicker_Send: String { return self._s[2930]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2931]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2932]! } - public var Call_AudioRouteSpeaker: String { return self._s[2933]! } - public var Watch_UserInfo_Title: String { return self._s[2934]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[2935]! } - public var Appearance_AccentColor: String { return self._s[2937]! } + public var ChatList_UndoArchiveTitle: String { return self._s[2931]! } + public var Notification_Exceptions_Add: String { return self._s[2932]! } + public var DialogList_You: String { return self._s[2933]! } + public var MediaPicker_Send: String { return self._s[2936]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2937]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2938]! } + public var Call_AudioRouteSpeaker: String { return self._s[2939]! } + public var Watch_UserInfo_Title: String { return self._s[2940]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[2941]! } + public var Appearance_AccentColor: String { return self._s[2943]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_0]) + return formatWithArgumentRanges(self._s[2944]!, self._r[2944]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2939]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2945]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2940]!, self._r[2940]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2946]!, self._r[2946]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[2941]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[2942]! } - public var Notification_CallOutgoing: String { return self._s[2943]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2944]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2945]! } - public var Call_RecordingDisabledMessage: String { return self._s[2946]! } - public var Message_Game: String { return self._s[2947]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[2948]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2949]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2950]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2951]! } - public var Date_DialogDateFormat: String { return self._s[2952]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2953]! } - public var Notifications_InAppNotifications: String { return self._s[2954]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2947]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2948]! } + public var Notification_CallOutgoing: String { return self._s[2949]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2950]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2951]! } + public var Call_RecordingDisabledMessage: String { return self._s[2952]! } + public var Message_Game: String { return self._s[2953]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[2954]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2955]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2956]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2957]! } + public var Date_DialogDateFormat: String { return self._s[2958]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2959]! } + public var Notifications_InAppNotifications: String { return self._s[2960]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_0]) + return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2956]!, self._r[2956]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[2957]! } + public var NewContact_Title: String { return self._s[2963]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2958]!, self._r[2958]!, [_0]) + return formatWithArgumentRanges(self._s[2964]!, self._r[2964]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[2959]! } + public var Conversation_ViewContactDetails: String { return self._s[2965]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_1]) + return formatWithArgumentRanges(self._s[2967]!, self._r[2967]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2962]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[2963]! } - public var PrivacySettings_Title: String { return self._s[2964]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2967]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2968]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[2969]! } - public var Contacts_PhoneNumber: String { return self._s[2970]! } - public var Map_ShowPlaces: String { return self._s[2972]! } - public var ChatAdmins_Title: String { return self._s[2973]! } - public var InstantPage_Reference: String { return self._s[2975]! } - public var Wallet_Info_Updating: String { return self._s[2976]! } - public var ReportGroupLocation_Text: String { return self._s[2977]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2968]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2969]! } + public var PrivacySettings_Title: String { return self._s[2970]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2973]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2974]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[2975]! } + public var Contacts_PhoneNumber: String { return self._s[2976]! } + public var Map_ShowPlaces: String { return self._s[2978]! } + public var ChatAdmins_Title: String { return self._s[2979]! } + public var InstantPage_Reference: String { return self._s[2981]! } + public var Wallet_Info_Updating: String { return self._s[2982]! } + public var ReportGroupLocation_Text: String { return self._s[2983]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2984]!, self._r[2984]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[2979]! } - public var Wallet_Intro_TermsUrl: String { return self._s[2980]! } - public var Watch_UserInfo_Block: String { return self._s[2981]! } - public var ChatSettings_Stickers: String { return self._s[2982]! } - public var ChatSettings_DownloadInBackground: String { return self._s[2983]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[2984]! } + public var Camera_FlashOff: String { return self._s[2985]! } + public var Wallet_Intro_TermsUrl: String { return self._s[2986]! } + public var Watch_UserInfo_Block: String { return self._s[2987]! } + public var ChatSettings_Stickers: String { return self._s[2988]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2989]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[2990]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_0]) + return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[2986]! } - public var Login_CheckOtherSessionMessages: String { return self._s[2987]! } - public var AutoDownloadSettings_Cellular: String { return self._s[2988]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[2989]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2990]! } - public var VoiceOver_MessageContextShare: String { return self._s[2991]! } + public var Settings_ViewPhoto: String { return self._s[2992]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2993]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2994]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[2995]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2996]! } + public var VoiceOver_MessageContextShare: String { return self._s[2997]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2993]!, self._r[2993]!, [_0]) + return formatWithArgumentRanges(self._s[2999]!, self._r[2999]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[2994]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2995]! } + public var Privacy_DeleteDrafts: String { return self._s[3000]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3001]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0]) + return formatWithArgumentRanges(self._s[3002]!, self._r[3002]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[2997]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[2998]! } - public var DialogList_SavedMessages: String { return self._s[2999]! } - public var GroupInfo_UpgradeButton: String { return self._s[3000]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3002]! } - public var DialogList_Pin: String { return self._s[3003]! } + public var DialogList_SavedMessagesHelp: String { return self._s[3003]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3004]! } + public var DialogList_SavedMessages: String { return self._s[3005]! } + public var GroupInfo_UpgradeButton: String { return self._s[3006]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3008]! } + public var DialogList_Pin: String { return self._s[3009]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3004]!, self._r[3004]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3010]!, self._r[3010]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3005]!, self._r[3005]!, [_0]) + return formatWithArgumentRanges(self._s[3011]!, self._r[3011]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3006]! } - public var UserInfo_NotificationsDisable: String { return self._s[3007]! } - public var Paint_Outlined: String { return self._s[3008]! } - public var Activity_PlayingGame: String { return self._s[3009]! } - public var SearchImages_NoImagesFound: String { return self._s[3010]! } - public var SocksProxySetup_ProxyType: String { return self._s[3011]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3013]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3014]! } - public var Settings_AppLanguage: String { return self._s[3015]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3016]! } - public var Common_ChoosePhoto: String { return self._s[3017]! } - public var CallFeedback_ReasonEcho: String { return self._s[3018]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3012]! } + public var UserInfo_NotificationsDisable: String { return self._s[3013]! } + public var Paint_Outlined: String { return self._s[3014]! } + public var Activity_PlayingGame: String { return self._s[3015]! } + public var SearchImages_NoImagesFound: String { return self._s[3016]! } + public var SocksProxySetup_ProxyType: String { return self._s[3017]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3019]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3020]! } + public var Settings_AppLanguage: String { return self._s[3021]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3022]! } + public var Common_ChoosePhoto: String { return self._s[3023]! } + public var CallFeedback_ReasonEcho: String { return self._s[3024]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3019]!, self._r[3019]!, [_1]) + return formatWithArgumentRanges(self._s[3025]!, self._r[3025]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3020]! } - public var Activity_UploadingVideo: String { return self._s[3021]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3022]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3023]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3024]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3025]! } - public var PUSH_SENDER_YOU: String { return self._s[3026]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3027]! } - public var Checkout_PayWithTouchId: String { return self._s[3028]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3029]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3026]! } + public var Activity_UploadingVideo: String { return self._s[3027]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3028]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3029]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3030]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3031]! } + public var PUSH_SENDER_YOU: String { return self._s[3032]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3033]! } + public var Checkout_PayWithTouchId: String { return self._s[3034]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3035]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3031]!, self._r[3031]!, [_1]) + return formatWithArgumentRanges(self._s[3037]!, self._r[3037]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[3032]! } + public var Notifications_ExceptionsNone: String { return self._s[3038]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3033]!, self._r[3033]!, [_0]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_1]) + return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3036]! } - public var Passport_Address_Region: String { return self._s[3039]! } - public var ChatList_DeleteChat: String { return self._s[3040]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3041]! } - public var PhotoEditor_TiltShift: String { return self._s[3042]! } - public var Settings_FAQ_URL: String { return self._s[3043]! } - public var Passport_Language_sl: String { return self._s[3044]! } - public var Settings_PrivacySettings: String { return self._s[3046]! } - public var SharedMedia_TitleLink: String { return self._s[3047]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3048]! } - public var Settings_SetProfilePhoto: String { return self._s[3049]! } - public var Channel_About_Help: String { return self._s[3050]! } - public var Contacts_PermissionsEnable: String { return self._s[3051]! } - public var Wallet_Sending_Title: String { return self._s[3052]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3053]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3054]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3056]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3057]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3058]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3059]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3060]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3062]! } - public var Map_OpenInYandexMaps: String { return self._s[3064]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3065]! } - public var VoiceOver_MessageContextReply: String { return self._s[3066]! } - public var PhotoEditor_SaturationTool: String { return self._s[3067]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3042]! } + public var Passport_Address_Region: String { return self._s[3045]! } + public var ChatList_DeleteChat: String { return self._s[3046]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3047]! } + public var PhotoEditor_TiltShift: String { return self._s[3048]! } + public var Settings_FAQ_URL: String { return self._s[3049]! } + public var Passport_Language_sl: String { return self._s[3050]! } + public var Settings_PrivacySettings: String { return self._s[3052]! } + public var SharedMedia_TitleLink: String { return self._s[3053]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3054]! } + public var Settings_SetProfilePhoto: String { return self._s[3055]! } + public var Channel_About_Help: String { return self._s[3056]! } + public var Contacts_PermissionsEnable: String { return self._s[3057]! } + public var Wallet_Sending_Title: String { return self._s[3058]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3059]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3060]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3062]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3063]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3064]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3065]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3066]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3068]! } + public var Map_OpenInYandexMaps: String { return self._s[3070]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3071]! } + public var VoiceOver_MessageContextReply: String { return self._s[3072]! } + public var PhotoEditor_SaturationTool: String { return self._s[3073]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3068]!, self._r[3068]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3074]!, self._r[3074]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3069]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3070]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3071]! } - public var Appearance_TextSize: String { return self._s[3072]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3075]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3076]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3077]! } + public var Appearance_TextSize: String { return self._s[3078]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3079]!, self._r[3079]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3074]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3076]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3080]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3082]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3077]!, self._r[3077]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3083]!, self._r[3083]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3084]!, self._r[3084]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[3079]! } - public var Passport_PassportInformation: String { return self._s[3082]! } - public var Theme_Unsupported: String { return self._s[3083]! } - public var WatchRemote_AlertTitle: String { return self._s[3084]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3085]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3087]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3085]! } + public var Passport_PassportInformation: String { return self._s[3088]! } + public var Theme_Unsupported: String { return self._s[3089]! } + public var WatchRemote_AlertTitle: String { return self._s[3090]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3091]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3093]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_0]) + return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3089]!, self._r[3089]!, [_1]) + return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3090]! } - public var Wallet_Navigation_Done: String { return self._s[3092]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3093]! } - public var AccessDenied_CameraDisabled: String { return self._s[3094]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3096]! } + public var Wallet_Navigation_Done: String { return self._s[3098]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3099]! } + public var AccessDenied_CameraDisabled: String { return self._s[3100]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_0]) + return formatWithArgumentRanges(self._s[3101]!, self._r[3101]!, [_0]) } - public var PhotoEditor_ContrastTool: String { return self._s[3098]! } + public var PhotoEditor_ContrastTool: String { return self._s[3104]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_1]) + return formatWithArgumentRanges(self._s[3105]!, self._r[3105]!, [_1]) } - public var DialogList_Draft: String { return self._s[3100]! } - public var Privacy_TopPeersDelete: String { return self._s[3102]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3103]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3104]! } - public var WebSearch_RecentSectionClear: String { return self._s[3105]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3106]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3108]! } - public var Common_Done: String { return self._s[3110]! } - public var AuthSessions_EmptyText: String { return self._s[3111]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3112]! } - public var Tour_Title5: String { return self._s[3113]! } - public var Wallet_Settings_Title: String { return self._s[3114]! } + public var DialogList_Draft: String { return self._s[3106]! } + public var Privacy_TopPeersDelete: String { return self._s[3108]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3109]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3110]! } + public var WebSearch_RecentSectionClear: String { return self._s[3111]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3112]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3114]! } + public var Common_Done: String { return self._s[3116]! } + public var AuthSessions_EmptyText: String { return self._s[3117]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3118]! } + public var Tour_Title5: String { return self._s[3119]! } + public var Wallet_Settings_Title: String { return self._s[3120]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3115]!, self._r[3115]!, [_0]) + return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3116]! } - public var Conversation_LinkDialogSave: String { return self._s[3117]! } - public var GroupInfo_ActionRestrict: String { return self._s[3118]! } - public var Checkout_Title: String { return self._s[3119]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3121]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3123]! } - public var Notification_RenamedGroup: String { return self._s[3124]! } - public var PeopleNearby_Groups: String { return self._s[3125]! } - public var Checkout_PayWithFaceId: String { return self._s[3126]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3127]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3129]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3130]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3131]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3122]! } + public var Conversation_LinkDialogSave: String { return self._s[3123]! } + public var GroupInfo_ActionRestrict: String { return self._s[3124]! } + public var Checkout_Title: String { return self._s[3125]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3127]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3129]! } + public var Notification_RenamedGroup: String { return self._s[3130]! } + public var PeopleNearby_Groups: String { return self._s[3131]! } + public var Checkout_PayWithFaceId: String { return self._s[3132]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3133]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3135]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3136]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3137]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_0]) + return formatWithArgumentRanges(self._s[3138]!, self._r[3138]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3134]! } + public var Profile_AddToExisting: String { return self._s[3140]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3135]!, self._r[3135]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3141]!, self._r[3141]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3137]! } - public var Permissions_PrivacyPolicy: String { return self._s[3138]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3139]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3140]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3142]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3144]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3145]! } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3146]! } - public var VoiceOver_AttachMedia: String { return self._s[3148]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3149]! } + public var Cache_Files: String { return self._s[3143]! } + public var Permissions_PrivacyPolicy: String { return self._s[3144]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3145]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3146]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3148]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3150]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3151]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3152]! } + public var VoiceOver_AttachMedia: String { return self._s[3154]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3155]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3150]!, self._r[3150]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3151]! } - public var Conversation_SetReminder_Title: String { return self._s[3152]! } - public var Passport_FieldAddressHelp: String { return self._s[3153]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3154]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3155]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3157]! } + public var Conversation_SetReminder_Title: String { return self._s[3158]! } + public var Passport_FieldAddressHelp: String { return self._s[3159]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3160]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3161]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_0]) + return formatWithArgumentRanges(self._s[3162]!, self._r[3162]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3157]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3158]! } - public var Login_UnknownError: String { return self._s[3159]! } - public var Group_UpgradeNoticeText2: String { return self._s[3162]! } - public var Watch_Compose_AddContact: String { return self._s[3163]! } - public var Web_Error: String { return self._s[3164]! } - public var Gif_Search: String { return self._s[3165]! } - public var Profile_MessageLifetime1h: String { return self._s[3166]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3167]! } - public var Channel_Username_CheckingUsername: String { return self._s[3168]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3169]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3170]! } - public var Channel_AboutItem: String { return self._s[3171]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3173]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3174]! } - public var GroupInfo_SharedMedia: String { return self._s[3175]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3163]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3164]! } + public var Login_UnknownError: String { return self._s[3165]! } + public var Group_UpgradeNoticeText2: String { return self._s[3168]! } + public var Watch_Compose_AddContact: String { return self._s[3169]! } + public var Web_Error: String { return self._s[3170]! } + public var Gif_Search: String { return self._s[3171]! } + public var Profile_MessageLifetime1h: String { return self._s[3172]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3173]! } + public var Channel_Username_CheckingUsername: String { return self._s[3174]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3175]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3176]! } + public var Channel_AboutItem: String { return self._s[3177]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3179]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3180]! } + public var GroupInfo_SharedMedia: String { return self._s[3181]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_1]) + return formatWithArgumentRanges(self._s[3182]!, self._r[3182]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3177]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3183]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3178]!, self._r[3178]!, [_1]) + return formatWithArgumentRanges(self._s[3184]!, self._r[3184]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3179]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3180]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3181]! } - public var CreatePoll_AddOption: String { return self._s[3182]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3183]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3184]! } - public var Channel_Management_AddModerator: String { return self._s[3185]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3186]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3187]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3188]! } - public var NotificationsSound_Hello: String { return self._s[3190]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3191]! } - public var Channel_Stickers_Placeholder: String { return self._s[3193]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3185]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3186]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3187]! } + public var CreatePoll_AddOption: String { return self._s[3188]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3189]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3190]! } + public var Channel_Management_AddModerator: String { return self._s[3191]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3192]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3193]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3194]! } + public var NotificationsSound_Hello: String { return self._s[3196]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3197]! } + public var Channel_Stickers_Placeholder: String { return self._s[3199]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3194]!, self._r[3194]!, [_0]) + return formatWithArgumentRanges(self._s[3200]!, self._r[3200]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3195]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3196]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3197]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3198]! } - public var AutoDownloadSettings_Channels: String { return self._s[3199]! } - public var Passport_Language_mn: String { return self._s[3200]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3203]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3204]! } - public var Passport_Language_ja: String { return self._s[3206]! } - public var Settings_About_Title: String { return self._s[3207]! } - public var Settings_NotificationsAndSounds: String { return self._s[3208]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3209]! } - public var Settings_BlockedUsers: String { return self._s[3210]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3201]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3202]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3203]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3204]! } + public var AutoDownloadSettings_Channels: String { return self._s[3205]! } + public var Passport_Language_mn: String { return self._s[3206]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3209]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3210]! } + public var Passport_Language_ja: String { return self._s[3212]! } + public var Settings_About_Title: String { return self._s[3213]! } + public var Settings_NotificationsAndSounds: String { return self._s[3214]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3215]! } + public var Settings_BlockedUsers: String { return self._s[3216]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3211]!, self._r[3211]!, [_0]) - } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3212]! } - public var Wallet_Weekday_Today: String { return self._s[3213]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3214]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3215]! } - public var Channel_Username_Title: String { return self._s[3216]! } - public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3219]! } - public var AppleWatch_Title: String { return self._s[3220]! } - public var Activity_RecordingVideoMessage: String { return self._s[3221]! } - public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3222]!, self._r[3222]!, [_1, _2]) + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3218]! } + public var Wallet_Weekday_Today: String { return self._s[3219]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3220]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3221]! } + public var Channel_Username_Title: String { return self._s[3222]! } + public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3223]!, self._r[3223]!, [_0]) } - public var Weekday_Saturday: String { return self._s[3223]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3224]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3225]! } - public var Common_Next: String { return self._s[3227]! } - public var Channel_Stickers_YourStickers: String { return self._s[3229]! } - public var Message_Theme: String { return self._s[3230]! } - public var Call_AudioRouteHeadphones: String { return self._s[3231]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3233]! } - public var Watch_Contacts_NoResults: String { return self._s[3235]! } - public var PhotoEditor_TintTool: String { return self._s[3238]! } - public var LoginPassword_ResetAccount: String { return self._s[3240]! } - public var Settings_SavedMessages: String { return self._s[3241]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3242]! } - public var Bot_GenericSupportStatus: String { return self._s[3243]! } - public var StickerPack_Add: String { return self._s[3244]! } - public var Checkout_TotalAmount: String { return self._s[3245]! } - public var Your_cards_number_is_invalid: String { return self._s[3246]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3247]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3248]! } + public var AttachmentMenu_File: String { return self._s[3225]! } + public var AppleWatch_Title: String { return self._s[3226]! } + public var Activity_RecordingVideoMessage: String { return self._s[3227]! } + public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3228]!, self._r[3228]!, [_1, _2]) + } + public var Weekday_Saturday: String { return self._s[3229]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3230]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3231]! } + public var Common_Next: String { return self._s[3233]! } + public var Channel_Stickers_YourStickers: String { return self._s[3235]! } + public var Message_Theme: String { return self._s[3236]! } + public var Call_AudioRouteHeadphones: String { return self._s[3237]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3239]! } + public var Watch_Contacts_NoResults: String { return self._s[3241]! } + public var PhotoEditor_TintTool: String { return self._s[3244]! } + public var LoginPassword_ResetAccount: String { return self._s[3246]! } + public var Settings_SavedMessages: String { return self._s[3247]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3248]! } + public var Bot_GenericSupportStatus: String { return self._s[3249]! } + public var StickerPack_Add: String { return self._s[3250]! } + public var Checkout_TotalAmount: String { return self._s[3251]! } + public var Your_cards_number_is_invalid: String { return self._s[3252]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3253]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3254]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3249]!, self._r[3249]!, [_0]) + return formatWithArgumentRanges(self._s[3255]!, self._r[3255]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3250]!, self._r[3250]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3256]!, self._r[3256]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3251]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3257]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3259]!, self._r[3259]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3254]!, self._r[3254]!, [_0]) + return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3255]! } - public var StickerPack_Share: String { return self._s[3256]! } - public var Passport_DeleteAddress: String { return self._s[3257]! } - public var Settings_Passport: String { return self._s[3258]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3259]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3260]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3261]! } - public var Contacts_PermissionsText: String { return self._s[3262]! } - public var Group_Setup_HistoryVisible: String { return self._s[3263]! } - public var Wallet_Month_ShortDecember: String { return self._s[3265]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3266]! } - public var SocksProxySetup_Title: String { return self._s[3267]! } - public var Notification_Mute1h: String { return self._s[3268]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3261]! } + public var StickerPack_Share: String { return self._s[3262]! } + public var Passport_DeleteAddress: String { return self._s[3263]! } + public var Settings_Passport: String { return self._s[3264]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3265]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3266]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3267]! } + public var Contacts_PermissionsText: String { return self._s[3268]! } + public var Group_Setup_HistoryVisible: String { return self._s[3269]! } + public var Wallet_Month_ShortDecember: String { return self._s[3271]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3272]! } + public var SocksProxySetup_Title: String { return self._s[3273]! } + public var Notification_Mute1h: String { return self._s[3274]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3269]!, self._r[3269]!, [_0]) + return formatWithArgumentRanges(self._s[3275]!, self._r[3275]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3270]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3276]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3271]!, self._r[3271]!, [_1]) + return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3272]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3275]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3277]! } - public var DialogList_NoMessagesText: String { return self._s[3278]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3279]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3280]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3282]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3283]! } - public var Common_TakePhotoOrVideo: String { return self._s[3284]! } - public var Wallet_Words_Text: String { return self._s[3285]! } - public var Call_StatusBusy: String { return self._s[3286]! } - public var Conversation_PinnedMessage: String { return self._s[3287]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3288]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3289]! } - public var Undo_ChatCleared: String { return self._s[3290]! } - public var AppleWatch_ReplyPresets: String { return self._s[3291]! } - public var Passport_DiscardMessageDescription: String { return self._s[3293]! } - public var Login_NetworkError: String { return self._s[3294]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3278]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3281]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3283]! } + public var DialogList_NoMessagesText: String { return self._s[3284]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3285]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3286]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3288]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3289]! } + public var Common_TakePhotoOrVideo: String { return self._s[3290]! } + public var Wallet_Words_Text: String { return self._s[3291]! } + public var Call_StatusBusy: String { return self._s[3292]! } + public var Conversation_PinnedMessage: String { return self._s[3293]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3294]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3295]! } + public var Undo_ChatCleared: String { return self._s[3296]! } + public var AppleWatch_ReplyPresets: String { return self._s[3297]! } + public var Passport_DiscardMessageDescription: String { return self._s[3299]! } + public var Login_NetworkError: String { return self._s[3300]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3295]!, self._r[3295]!, [_0]) + return formatWithArgumentRanges(self._s[3301]!, self._r[3301]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_0]) - } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3297]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3299]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3300]! } - public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3303]! } - public var VoiceOver_Chat_Music: String { return self._s[3304]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3305]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3307]! } - public var ConversationMedia_Title: String { return self._s[3308]! } - public var EncryptionKey_Title: String { return self._s[3310]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3311]! } - public var Notification_Exceptions_AddException: String { return self._s[3312]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3313]! } - public var Profile_MessageLifetime1m: String { return self._s[3314]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3303]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3305]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3306]! } + public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3308]!, self._r[3308]!, [_0]) + } + public var Call_ConnectionErrorMessage: String { return self._s[3309]! } + public var VoiceOver_Chat_Music: String { return self._s[3310]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3311]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3313]! } + public var ConversationMedia_Title: String { return self._s[3314]! } + public var EncryptionKey_Title: String { return self._s[3316]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3317]! } + public var Notification_Exceptions_AddException: String { return self._s[3318]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3319]! } + public var Profile_MessageLifetime1m: String { return self._s[3320]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3315]!, self._r[3315]!, [_1]) + return formatWithArgumentRanges(self._s[3321]!, self._r[3321]!, [_1]) } - public var Month_GenMay: String { return self._s[3316]! } + public var Month_GenMay: String { return self._s[3322]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3317]!, self._r[3317]!, [_0]) - } - public var PeopleNearby_Users: String { return self._s[3318]! } - public var Wallet_Send_AddressInfo: String { return self._s[3319]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3320]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3321]! } - public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3324]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3325]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3326]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3327]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3328]! } - public var Channel_JoinChannel: String { return self._s[3330]! } - public var Appearance_Animations: String { return self._s[3333]! } - public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3334]!, self._r[3334]!, [_1, _2]) + public var PeopleNearby_Users: String { return self._s[3324]! } + public var Wallet_Send_AddressInfo: String { return self._s[3325]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3326]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3327]! } + public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3329]!, self._r[3329]!, [_0]) } - public var Stickers_GroupStickers: String { return self._s[3336]! } - public var Appearance_ShareTheme: String { return self._s[3337]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3339]! } - public var Passport_Address_Street: String { return self._s[3340]! } - public var Conversation_AddContact: String { return self._s[3341]! } - public var Login_PhonePlaceholder: String { return self._s[3342]! } - public var Channel_Members_InviteLink: String { return self._s[3344]! } - public var Bot_Stop: String { return self._s[3345]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3347]! } - public var Notification_PassportValueAddress: String { return self._s[3348]! } - public var Month_ShortJuly: String { return self._s[3349]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3350]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3351]! } - public var Passport_Identity_ReverseSide: String { return self._s[3352]! } - public var Watch_Stickers_Recents: String { return self._s[3355]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3357]! } - public var Map_SendThisLocation: String { return self._s[3358]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3330]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3331]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3332]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3333]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3334]! } + public var Channel_JoinChannel: String { return self._s[3336]! } + public var Appearance_Animations: String { return self._s[3339]! } + public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3340]!, self._r[3340]!, [_1, _2]) + } + public var Stickers_GroupStickers: String { return self._s[3342]! } + public var Appearance_ShareTheme: String { return self._s[3343]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3345]! } + public var Passport_Address_Street: String { return self._s[3346]! } + public var Conversation_AddContact: String { return self._s[3347]! } + public var Login_PhonePlaceholder: String { return self._s[3348]! } + public var Channel_Members_InviteLink: String { return self._s[3350]! } + public var Bot_Stop: String { return self._s[3351]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3353]! } + public var Notification_PassportValueAddress: String { return self._s[3354]! } + public var Month_ShortJuly: String { return self._s[3355]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3356]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3357]! } + public var Passport_Identity_ReverseSide: String { return self._s[3358]! } + public var Watch_Stickers_Recents: String { return self._s[3361]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3363]! } + public var Map_SendThisLocation: String { return self._s[3364]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) + return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_0]) + return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3361]! } - public var Wallet_Intro_NotNow: String { return self._s[3362]! } + public var ConvertToSupergroup_Note: String { return self._s[3367]! } + public var Wallet_Intro_NotNow: String { return self._s[3368]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3363]!, self._r[3363]!, [_0]) + return formatWithArgumentRanges(self._s[3369]!, self._r[3369]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3364]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3370]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3367]! } - public var Wallpaper_SearchShort: String { return self._s[3368]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3370]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3371]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3372]! } + public var Login_CallRequestState3: String { return self._s[3373]! } + public var Wallpaper_SearchShort: String { return self._s[3374]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3376]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3377]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3378]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3373]!, self._r[3373]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3379]!, self._r[3379]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3374]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3378]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3380]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3384]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3379]!, self._r[3379]!, [_0]) + return formatWithArgumentRanges(self._s[3385]!, self._r[3385]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3380]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3381]! } + public var Passport_CorrectErrors: String { return self._s[3386]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3387]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_0]) + return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3383]! } - public var Channel_DiscussionGroup: String { return self._s[3384]! } + public var Map_SendMyCurrentLocation: String { return self._s[3389]! } + public var Channel_DiscussionGroup: String { return self._s[3390]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3385]!, self._r[3385]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3391]!, self._r[3391]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3386]! } - public var Permissions_NotificationsText_v0: String { return self._s[3387]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3388]! } - public var Appearance_AppIcon: String { return self._s[3389]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3390]! } - public var LoginPassword_FloodError: String { return self._s[3391]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3393]! } + public var SharedMedia_SearchNoResults: String { return self._s[3392]! } + public var Permissions_NotificationsText_v0: String { return self._s[3393]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3394]! } + public var Appearance_AppIcon: String { return self._s[3395]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3396]! } + public var LoginPassword_FloodError: String { return self._s[3397]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3399]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_0]) + return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3395]! } + public var Passport_Language_bn: String { return self._s[3401]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3396]!, self._r[3396]!, [_0]) + return formatWithArgumentRanges(self._s[3402]!, self._r[3402]!, [_0]) } - public var ChatList_Context_Pin: String { return self._s[3397]! } + public var ChatList_Context_Pin: String { return self._s[3403]! } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3398]!, self._r[3398]!, [_0]) + return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_0]) } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_0]) + return formatWithArgumentRanges(self._s[3405]!, self._r[3405]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3400]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3404]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3406]! } - public var Wallet_Month_GenDecember: String { return self._s[3407]! } - public var Contacts_PermissionsAllow: String { return self._s[3408]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3409]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3410]! } - public var WallpaperPreview_Pattern: String { return self._s[3411]! } - public var Paint_Duplicate: String { return self._s[3412]! } - public var Passport_Address_Country: String { return self._s[3413]! } - public var Notification_RenamedChannel: String { return self._s[3415]! } - public var ChatList_Context_Unmute: String { return self._s[3416]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3417]! } - public var Group_MessagePhotoUpdated: String { return self._s[3418]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3419]! } - public var Conversation_ContextMenuBan: String { return self._s[3420]! } - public var TwoStepAuth_EmailSent: String { return self._s[3421]! } - public var MessagePoll_NoVotes: String { return self._s[3422]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3423]! } - public var Passport_Language_is: String { return self._s[3424]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3426]! } - public var Tour_Text5: String { return self._s[3427]! } + public var Wallet_Navigation_Close: String { return self._s[3406]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3410]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3412]! } + public var Wallet_Month_GenDecember: String { return self._s[3413]! } + public var Contacts_PermissionsAllow: String { return self._s[3414]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3415]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3416]! } + public var WallpaperPreview_Pattern: String { return self._s[3417]! } + public var Paint_Duplicate: String { return self._s[3418]! } + public var Passport_Address_Country: String { return self._s[3419]! } + public var Notification_RenamedChannel: String { return self._s[3421]! } + public var ChatList_Context_Unmute: String { return self._s[3422]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3423]! } + public var Group_MessagePhotoUpdated: String { return self._s[3424]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3425]! } + public var Conversation_ContextMenuBan: String { return self._s[3426]! } + public var TwoStepAuth_EmailSent: String { return self._s[3427]! } + public var MessagePoll_NoVotes: String { return self._s[3428]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3429]! } + public var Passport_Language_is: String { return self._s[3430]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3432]! } + public var Tour_Text5: String { return self._s[3433]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3429]!, self._r[3429]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3435]!, self._r[3435]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3430]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3431]! } + public var Undo_SecretChatDeleted: String { return self._s[3436]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3437]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3432]!, self._r[3432]!, [_0]) + return formatWithArgumentRanges(self._s[3438]!, self._r[3438]!, [_0]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3433]! } - public var Paint_Edit: String { return self._s[3435]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3437]! } - public var Undo_DeletedGroup: String { return self._s[3439]! } - public var LoginPassword_ForgotPassword: String { return self._s[3440]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3441]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3442]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3439]! } + public var Paint_Edit: String { return self._s[3441]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3443]! } + public var Undo_DeletedGroup: String { return self._s[3445]! } + public var LoginPassword_ForgotPassword: String { return self._s[3446]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3447]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3448]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3443]!, self._r[3443]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3449]!, self._r[3449]!, [_0, _1]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3444]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3445]! } - public var Passport_Language_uz: String { return self._s[3446]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3447]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3448]! } - public var Map_StopLiveLocation: String { return self._s[3450]! } - public var VoiceOver_MessageContextSend: String { return self._s[3452]! } - public var PasscodeSettings_Help: String { return self._s[3453]! } - public var NotificationsSound_Input: String { return self._s[3454]! } - public var Share_Title: String { return self._s[3457]! } - public var LogoutOptions_Title: String { return self._s[3458]! } - public var Wallet_Send_AddressText: String { return self._s[3459]! } - public var Login_TermsOfServiceAgree: String { return self._s[3460]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3461]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3462]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3463]! } - public var EnterPasscode_EnterTitle: String { return self._s[3464]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3450]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3451]! } + public var Passport_Language_uz: String { return self._s[3452]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3453]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3454]! } + public var Map_StopLiveLocation: String { return self._s[3456]! } + public var VoiceOver_MessageContextSend: String { return self._s[3458]! } + public var PasscodeSettings_Help: String { return self._s[3459]! } + public var NotificationsSound_Input: String { return self._s[3460]! } + public var Share_Title: String { return self._s[3463]! } + public var LogoutOptions_Title: String { return self._s[3464]! } + public var Wallet_Send_AddressText: String { return self._s[3465]! } + public var Login_TermsOfServiceAgree: String { return self._s[3466]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3467]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3468]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3469]! } + public var EnterPasscode_EnterTitle: String { return self._s[3470]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3465]!, self._r[3465]!, [_0]) + return formatWithArgumentRanges(self._s[3471]!, self._r[3471]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3466]! } - public var Conversation_AddToContacts: String { return self._s[3467]! } + public var Settings_CopyPhoneNumber: String { return self._s[3472]! } + public var Conversation_AddToContacts: String { return self._s[3473]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3468]!, self._r[3468]!, [_0]) + return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3469]! } + public var NotificationsSound_Keys: String { return self._s[3475]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3470]!, self._r[3470]!, [_0]) + return formatWithArgumentRanges(self._s[3476]!, self._r[3476]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3471]! } - public var Message_Video: String { return self._s[3472]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3473]! } + public var Notification_MessageLifetime1w: String { return self._s[3477]! } + public var Message_Video: String { return self._s[3478]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3479]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_1]) + return formatWithArgumentRanges(self._s[3480]!, self._r[3480]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3477]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3483]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3478]!, self._r[3478]!, [_0]) + return formatWithArgumentRanges(self._s[3484]!, self._r[3484]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3479]!, self._r[3479]!, [_0]) + return formatWithArgumentRanges(self._s[3485]!, self._r[3485]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3480]! } + public var Passport_Language_mk: String { return self._s[3486]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3481]!, self._r[3481]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3487]!, self._r[3487]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3482]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3484]! } - public var PrivacyPolicy_Decline: String { return self._s[3485]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3486]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3487]! } - public var Permissions_SiriAllow_v0: String { return self._s[3489]! } - public var Wallet_Month_ShortAugust: String { return self._s[3490]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3491]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3488]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3490]! } + public var PrivacyPolicy_Decline: String { return self._s[3491]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3492]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3493]! } + public var Permissions_SiriAllow_v0: String { return self._s[3495]! } + public var Wallet_Month_ShortAugust: String { return self._s[3496]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3497]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3492]!, self._r[3492]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3498]!, self._r[3498]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3493]!, self._r[3493]!, [_0]) + return formatWithArgumentRanges(self._s[3499]!, self._r[3499]!, [_0]) } - public var Paint_Regular: String { return self._s[3494]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3495]! } - public var SocksProxySetup_ShareLink: String { return self._s[3496]! } - public var Wallet_Qr_Title: String { return self._s[3497]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3498]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3500]! } - public var GroupInfo_InviteByLink: String { return self._s[3501]! } - public var MessageTimer_Custom: String { return self._s[3502]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3503]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3505]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3506]! } - public var VoiceOver_Chat_Selected: String { return self._s[3507]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3508]! } - public var Channel_Username_InvalidTaken: String { return self._s[3509]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3510]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3511]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3512]! } - public var Settings_ChatBackground: String { return self._s[3513]! } - public var Channel_Subscribers_Title: String { return self._s[3514]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3515]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3516]! } - public var Watch_ConnectionDescription: String { return self._s[3517]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3521]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3522]! } - public var EditProfile_Title: String { return self._s[3523]! } - public var NotificationsSound_Bamboo: String { return self._s[3525]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3527]! } - public var Login_SmsRequestState2: String { return self._s[3528]! } - public var Passport_Language_ar: String { return self._s[3529]! } + public var Paint_Regular: String { return self._s[3500]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3501]! } + public var SocksProxySetup_ShareLink: String { return self._s[3502]! } + public var Wallet_Qr_Title: String { return self._s[3503]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3504]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3506]! } + public var GroupInfo_InviteByLink: String { return self._s[3507]! } + public var MessageTimer_Custom: String { return self._s[3508]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3509]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3511]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3512]! } + public var VoiceOver_Chat_Selected: String { return self._s[3513]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3514]! } + public var Channel_Username_InvalidTaken: String { return self._s[3515]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3516]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3517]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3518]! } + public var Settings_ChatBackground: String { return self._s[3519]! } + public var Channel_Subscribers_Title: String { return self._s[3520]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3521]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3522]! } + public var Watch_ConnectionDescription: String { return self._s[3523]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3527]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3528]! } + public var EditProfile_Title: String { return self._s[3529]! } + public var NotificationsSound_Bamboo: String { return self._s[3531]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3533]! } + public var Login_SmsRequestState2: String { return self._s[3534]! } + public var Passport_Language_ar: String { return self._s[3535]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3530]!, self._r[3530]!, [_0]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3531]! } - public var Wallet_Created_Text: String { return self._s[3532]! } - public var Conversation_MessageDialogEdit: String { return self._s[3533]! } - public var Wallet_Created_Proceed: String { return self._s[3534]! } - public var Wallet_Words_Done: String { return self._s[3535]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3536]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3537]! } + public var Wallet_Created_Text: String { return self._s[3538]! } + public var Conversation_MessageDialogEdit: String { return self._s[3539]! } + public var Wallet_Created_Proceed: String { return self._s[3540]! } + public var Wallet_Words_Done: String { return self._s[3541]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3542]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3537]!, self._r[3537]!, [_1]) + return formatWithArgumentRanges(self._s[3543]!, self._r[3543]!, [_1]) } - public var Common_Close: String { return self._s[3538]! } - public var GroupInfo_PublicLink: String { return self._s[3539]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3540]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3541]! } + public var Common_Close: String { return self._s[3544]! } + public var GroupInfo_PublicLink: String { return self._s[3545]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3546]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3547]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3545]!, self._r[3545]!, [_0]) - } - public var UserInfo_About_Placeholder: String { return self._s[3546]! } - public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3547]!, self._r[3547]!, [_0]) - } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3548]! } - public var Channel_Info_Banned: String { return self._s[3550]! } - public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3551]!, self._r[3551]!, [_0]) } - public var Appearance_Other: String { return self._s[3552]! } - public var Passport_Language_my: String { return self._s[3553]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3554]! } + public var UserInfo_About_Placeholder: String { return self._s[3552]! } + public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_0]) + } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3554]! } + public var Channel_Info_Banned: String { return self._s[3556]! } + public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3557]!, self._r[3557]!, [_0]) + } + public var Appearance_Other: String { return self._s[3558]! } + public var Passport_Language_my: String { return self._s[3559]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3560]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3561]!, self._r[3561]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3556]! } - public var Preview_CopyAddress: String { return self._s[3557]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3562]! } + public var Preview_CopyAddress: String { return self._s[3563]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_0]) + return formatWithArgumentRanges(self._s[3564]!, self._r[3564]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3559]! } - public var UserInfo_BotSettings: String { return self._s[3560]! } - public var LiveLocation_MenuStopAll: String { return self._s[3562]! } - public var Passport_PasswordCreate: String { return self._s[3563]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3564]! } - public var Message_PinnedLocationMessage: String { return self._s[3565]! } - public var Map_Satellite: String { return self._s[3566]! } - public var Watch_Message_Unsupported: String { return self._s[3567]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3568]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3569]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3565]! } + public var UserInfo_BotSettings: String { return self._s[3566]! } + public var LiveLocation_MenuStopAll: String { return self._s[3568]! } + public var Passport_PasswordCreate: String { return self._s[3569]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3570]! } + public var Message_PinnedLocationMessage: String { return self._s[3571]! } + public var Map_Satellite: String { return self._s[3572]! } + public var Watch_Message_Unsupported: String { return self._s[3573]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3574]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3575]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3570]!, self._r[3570]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3576]!, self._r[3576]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3571]!, self._r[3571]!, [_0]) + return formatWithArgumentRanges(self._s[3577]!, self._r[3577]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3572]! } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3573]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3574]! } - public var NotificationsSound_None: String { return self._s[3575]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3576]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3578]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3579]! } + public var Wallet_WordImport_Continue: String { return self._s[3578]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3579]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3580]! } + public var NotificationsSound_None: String { return self._s[3581]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3582]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3584]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3585]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3580]!, self._r[3580]!, [_1]) + return formatWithArgumentRanges(self._s[3586]!, self._r[3586]!, [_1]) } - public var Cache_Indexing: String { return self._s[3581]! } - public var DialogList_RecentTitlePeople: String { return self._s[3583]! } - public var DialogList_EncryptionRejected: String { return self._s[3584]! } - public var GroupInfo_Administrators: String { return self._s[3585]! } - public var Passport_ScanPassportHelp: String { return self._s[3586]! } - public var Application_Name: String { return self._s[3587]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3588]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3590]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3591]! } + public var Cache_Indexing: String { return self._s[3587]! } + public var DialogList_RecentTitlePeople: String { return self._s[3589]! } + public var DialogList_EncryptionRejected: String { return self._s[3590]! } + public var GroupInfo_Administrators: String { return self._s[3591]! } + public var Passport_ScanPassportHelp: String { return self._s[3592]! } + public var Application_Name: String { return self._s[3593]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3594]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3596]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3597]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3592]!, self._r[3592]!, [_0]) + return formatWithArgumentRanges(self._s[3598]!, self._r[3598]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3593]!, self._r[3593]!, [_0]) + return formatWithArgumentRanges(self._s[3599]!, self._r[3599]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3594]!, self._r[3594]!, [_0]) + return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3595]! } - public var Privacy_ChatsTitle: String { return self._s[3596]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3597]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3598]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3599]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3600]! } - public var Group_LinkedChannel: String { return self._s[3601]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3602]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3603]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3604]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3605]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3607]! } - public var Channel_Setup_TypePublic: String { return self._s[3609]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3601]! } + public var Privacy_ChatsTitle: String { return self._s[3602]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3603]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3604]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3605]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3606]! } + public var Group_LinkedChannel: String { return self._s[3607]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3608]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3609]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3610]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3611]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3613]! } + public var Channel_Setup_TypePublic: String { return self._s[3615]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3610]!, self._r[3610]!, [_0]) + return formatWithArgumentRanges(self._s[3616]!, self._r[3616]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3612]! } - public var Map_OpenInMaps: String { return self._s[3614]! } + public var Channel_TypeSetup_Title: String { return self._s[3618]! } + public var Map_OpenInMaps: String { return self._s[3620]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3615]!, self._r[3615]!, [_1]) + return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3617]! } + public var NotificationsSound_Tremolo: String { return self._s[3623]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3618]!, self._r[3618]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3619]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3620]! } - public var Passport_PasswordHelp: String { return self._s[3621]! } - public var Login_CodeExpiredError: String { return self._s[3622]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3623]! } - public var Conversation_TitleUnmute: String { return self._s[3624]! } - public var Passport_Identity_ScansHelp: String { return self._s[3625]! } - public var Passport_Language_lo: String { return self._s[3626]! } - public var Camera_FlashAuto: String { return self._s[3627]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3628]! } - public var Common_Cancel: String { return self._s[3629]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3630]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3631]! } - public var Appearance_TintAllColors: String { return self._s[3632]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3625]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3626]! } + public var Passport_PasswordHelp: String { return self._s[3627]! } + public var Login_CodeExpiredError: String { return self._s[3628]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3629]! } + public var Conversation_TitleUnmute: String { return self._s[3630]! } + public var Passport_Identity_ScansHelp: String { return self._s[3631]! } + public var Passport_Language_lo: String { return self._s[3632]! } + public var Camera_FlashAuto: String { return self._s[3633]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3634]! } + public var Common_Cancel: String { return self._s[3635]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3636]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3637]! } + public var Appearance_TintAllColors: String { return self._s[3638]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3633]!, self._r[3633]!, [_1]) + return formatWithArgumentRanges(self._s[3639]!, self._r[3639]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3634]! } - public var ChatSettings_Title: String { return self._s[3636]! } - public var Passport_PasswordReset: String { return self._s[3637]! } - public var SocksProxySetup_TypeNone: String { return self._s[3638]! } - public var EditTheme_Title: String { return self._s[3640]! } - public var PhoneNumberHelp_Help: String { return self._s[3641]! } - public var Checkout_EnterPassword: String { return self._s[3642]! } - public var Share_AuthTitle: String { return self._s[3644]! } - public var Activity_UploadingDocument: String { return self._s[3645]! } - public var State_Connecting: String { return self._s[3646]! } - public var Profile_MessageLifetime1w: String { return self._s[3647]! } - public var Conversation_ContextMenuReport: String { return self._s[3648]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3649]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3650]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3640]! } + public var ChatSettings_Title: String { return self._s[3642]! } + public var Passport_PasswordReset: String { return self._s[3643]! } + public var SocksProxySetup_TypeNone: String { return self._s[3644]! } + public var EditTheme_Title: String { return self._s[3646]! } + public var PhoneNumberHelp_Help: String { return self._s[3647]! } + public var Checkout_EnterPassword: String { return self._s[3648]! } + public var Share_AuthTitle: String { return self._s[3650]! } + public var Activity_UploadingDocument: String { return self._s[3651]! } + public var State_Connecting: String { return self._s[3652]! } + public var Profile_MessageLifetime1w: String { return self._s[3653]! } + public var Conversation_ContextMenuReport: String { return self._s[3654]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3655]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3656]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3651]!, self._r[3651]!, [_0]) + return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3652]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3653]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3654]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3655]! } - public var PhotoEditor_Set: String { return self._s[3656]! } - public var EmptyGroupInfo_Title: String { return self._s[3657]! } - public var Login_PadPhoneHelp: String { return self._s[3658]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3660]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3662]! } - public var NotificationsSound_Complete: String { return self._s[3663]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3664]! } - public var Group_Info_AdminLog: String { return self._s[3665]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3666]! } + public var AuthSessions_Terminate: String { return self._s[3658]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3659]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3660]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3661]! } + public var PhotoEditor_Set: String { return self._s[3662]! } + public var EmptyGroupInfo_Title: String { return self._s[3663]! } + public var Login_PadPhoneHelp: String { return self._s[3664]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3666]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3668]! } + public var NotificationsSound_Complete: String { return self._s[3669]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3670]! } + public var Group_Info_AdminLog: String { return self._s[3671]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3672]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3667]!, self._r[3667]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3673]!, self._r[3673]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3668]! } - public var Conversation_Admin: String { return self._s[3670]! } - public var Conversation_GifTooltip: String { return self._s[3671]! } - public var Passport_NotLoggedInMessage: String { return self._s[3672]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3674]! } + public var Conversation_Admin: String { return self._s[3676]! } + public var Conversation_GifTooltip: String { return self._s[3677]! } + public var Passport_NotLoggedInMessage: String { return self._s[3678]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3674]!, self._r[3674]!, [_0]) + return formatWithArgumentRanges(self._s[3680]!, self._r[3680]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3675]! } - public var SharedMedia_EmptyTitle: String { return self._s[3677]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3679]! } - public var Username_Help: String { return self._s[3680]! } - public var DialogList_LanguageTooltip: String { return self._s[3682]! } - public var Map_LoadError: String { return self._s[3683]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3684]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3685]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3686]! } - public var Notification_Exceptions_NewException: String { return self._s[3687]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3688]! } - public var WatchRemote_AlertText: String { return self._s[3689]! } + public var Profile_MessageLifetimeForever: String { return self._s[3681]! } + public var SharedMedia_EmptyTitle: String { return self._s[3683]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3685]! } + public var Username_Help: String { return self._s[3686]! } + public var DialogList_LanguageTooltip: String { return self._s[3688]! } + public var Map_LoadError: String { return self._s[3689]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3690]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3691]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3692]! } + public var Notification_Exceptions_NewException: String { return self._s[3693]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3694]! } + public var WatchRemote_AlertText: String { return self._s[3695]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3690]!, self._r[3690]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3696]!, self._r[3696]!, [_1, _2]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3694]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3700]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3695]!, self._r[3695]!, [_0]) + return formatWithArgumentRanges(self._s[3701]!, self._r[3701]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3696]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3697]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3702]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3703]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3698]!, self._r[3698]!, [_0]) + return formatWithArgumentRanges(self._s[3704]!, self._r[3704]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3699]!, self._r[3699]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3705]!, self._r[3705]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3700]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3701]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3703]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3704]! } - public var ChatList_UndoArchiveText1: String { return self._s[3705]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3706]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3707]! } - public var Cache_ClearNone: String { return self._s[3708]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3709]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3710]! } + public var Group_AdminLog_EmptyText: String { return self._s[3706]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3707]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3709]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3710]! } + public var ChatList_UndoArchiveText1: String { return self._s[3711]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3712]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3713]! } + public var Cache_ClearNone: String { return self._s[3714]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3715]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3716]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_0]) + return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3712]! } + public var Passport_Identity_Country: String { return self._s[3718]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_0]) + return formatWithArgumentRanges(self._s[3719]!, self._r[3719]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_0]) + return formatWithArgumentRanges(self._s[3720]!, self._r[3720]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3715]! } - public var AccessDenied_Settings: String { return self._s[3716]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3717]! } - public var Month_ShortMay: String { return self._s[3718]! } - public var Compose_NewGroup: String { return self._s[3720]! } - public var Group_Setup_TypePrivate: String { return self._s[3722]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3724]! } - public var Appearance_ThemeDayClassic: String { return self._s[3725]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3726]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3727]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3728]! } - public var Conversation_typing: String { return self._s[3730]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3731]! } - public var Paint_Masks: String { return self._s[3732]! } - public var Contacts_DeselectAll: String { return self._s[3733]! } + public var Exceptions_AddToExceptions: String { return self._s[3721]! } + public var AccessDenied_Settings: String { return self._s[3722]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3723]! } + public var Month_ShortMay: String { return self._s[3724]! } + public var Compose_NewGroup: String { return self._s[3726]! } + public var Group_Setup_TypePrivate: String { return self._s[3728]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3730]! } + public var Appearance_ThemeDayClassic: String { return self._s[3731]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3732]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3733]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3734]! } + public var Conversation_typing: String { return self._s[3736]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3737]! } + public var Paint_Masks: String { return self._s[3738]! } + public var Contacts_DeselectAll: String { return self._s[3739]! } public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3734]!, self._r[3734]!, [_0]) + return formatWithArgumentRanges(self._s[3740]!, self._r[3740]!, [_0]) } - public var Username_InvalidTaken: String { return self._s[3735]! } - public var Call_StatusNoAnswer: String { return self._s[3736]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3737]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3738]! } - public var Passport_Identity_Selfie: String { return self._s[3739]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3740]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3741]! } - public var Conversation_ClearSecretHistory: String { return self._s[3742]! } - public var PeopleNearby_Description: String { return self._s[3744]! } - public var NetworkUsageSettings_Title: String { return self._s[3745]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3747]! } + public var Username_InvalidTaken: String { return self._s[3741]! } + public var Call_StatusNoAnswer: String { return self._s[3742]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3743]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3744]! } + public var Passport_Identity_Selfie: String { return self._s[3745]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3746]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3747]! } + public var Conversation_ClearSecretHistory: String { return self._s[3748]! } + public var PeopleNearby_Description: String { return self._s[3750]! } + public var NetworkUsageSettings_Title: String { return self._s[3751]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3753]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3749]!, self._r[3749]!, [_0]) + return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3750]!, self._r[3750]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3756]!, self._r[3756]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3752]! } - public var VoiceOver_Navigation_Search: String { return self._s[3753]! } - public var Map_LiveLocationTitle: String { return self._s[3754]! } - public var Login_InfoAvatarAdd: String { return self._s[3755]! } - public var Passport_Identity_FilesView: String { return self._s[3756]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3757]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3758]! } - public var VoiceOver_Chat_File: String { return self._s[3759]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3760]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3758]! } + public var VoiceOver_Navigation_Search: String { return self._s[3759]! } + public var Map_LiveLocationTitle: String { return self._s[3760]! } + public var Login_InfoAvatarAdd: String { return self._s[3761]! } + public var Passport_Identity_FilesView: String { return self._s[3762]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3763]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3764]! } + public var VoiceOver_Chat_File: String { return self._s[3765]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3766]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3761]!, self._r[3761]!, [_0]) + return formatWithArgumentRanges(self._s[3767]!, self._r[3767]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3762]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3763]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3764]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3768]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3769]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3770]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3765]!, self._r[3765]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3771]!, self._r[3771]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3766]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[3767]! } - public var Tour_Title2: String { return self._s[3768]! } - public var Wallet_Sent_ViewWallet: String { return self._s[3769]! } - public var Conversation_FileOpenIn: String { return self._s[3770]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3771]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3772]! } - public var Wallpaper_Set: String { return self._s[3773]! } - public var Passport_Identity_Translations: String { return self._s[3775]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3772]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[3773]! } + public var Tour_Title2: String { return self._s[3774]! } + public var Wallet_Sent_ViewWallet: String { return self._s[3775]! } + public var Conversation_FileOpenIn: String { return self._s[3776]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3777]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3778]! } + public var Wallpaper_Set: String { return self._s[3779]! } + public var Passport_Identity_Translations: String { return self._s[3781]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3776]!, self._r[3776]!, [_0]) + return formatWithArgumentRanges(self._s[3782]!, self._r[3782]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3777]! } + public var Channel_LeaveChannel: String { return self._s[3783]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3778]!, self._r[3778]!, [_1]) + return formatWithArgumentRanges(self._s[3784]!, self._r[3784]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3780]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3781]! } - public var Passport_Email_Delete: String { return self._s[3782]! } - public var Conversation_Mute: String { return self._s[3784]! } - public var Channel_AddBotAsAdmin: String { return self._s[3785]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3787]! } - public var Channel_Management_LabelOwner: String { return self._s[3789]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3786]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3787]! } + public var Passport_Email_Delete: String { return self._s[3788]! } + public var Conversation_Mute: String { return self._s[3790]! } + public var Channel_AddBotAsAdmin: String { return self._s[3791]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3793]! } + public var Channel_Management_LabelOwner: String { return self._s[3795]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3796]!, self._r[3796]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3791]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3792]! } - public var Common_No: String { return self._s[3793]! } - public var Weekday_Sunday: String { return self._s[3794]! } - public var Notification_Reply: String { return self._s[3795]! } - public var Conversation_ViewMessage: String { return self._s[3796]! } + public var Calls_CallTabDescription: String { return self._s[3797]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3798]! } + public var Common_No: String { return self._s[3799]! } + public var Weekday_Sunday: String { return self._s[3800]! } + public var Notification_Reply: String { return self._s[3801]! } + public var Conversation_ViewMessage: String { return self._s[3802]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3797]!, self._r[3797]!, [_0]) + return formatWithArgumentRanges(self._s[3803]!, self._r[3803]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3798]!, self._r[3798]!, [_0]) + return formatWithArgumentRanges(self._s[3804]!, self._r[3804]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3799]!, self._r[3799]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3805]!, self._r[3805]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3800]! } - public var Wallet_Send_Title: String { return self._s[3801]! } - public var Message_PinnedDocumentMessage: String { return self._s[3802]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[3803]! } - public var DialogList_TabTitle: String { return self._s[3805]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3806]! } - public var Passport_FieldEmail: String { return self._s[3807]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3808]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3809]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[3810]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3811]! } - public var Privacy_Calls_P2P: String { return self._s[3812]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3806]! } + public var Wallet_Send_Title: String { return self._s[3807]! } + public var Message_PinnedDocumentMessage: String { return self._s[3808]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[3809]! } + public var DialogList_TabTitle: String { return self._s[3811]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3812]! } + public var Passport_FieldEmail: String { return self._s[3813]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3814]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3815]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[3816]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3817]! } + public var Privacy_Calls_P2P: String { return self._s[3818]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3814]!, self._r[3814]!, [_0]) + return formatWithArgumentRanges(self._s[3820]!, self._r[3820]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3815]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3821]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3816]!, self._r[3816]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3822]!, self._r[3822]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[3817]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3818]! } - public var Passport_InfoText: String { return self._s[3819]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3820]! } + public var Stickers_ClearRecent: String { return self._s[3823]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3824]! } + public var Passport_InfoText: String { return self._s[3825]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3826]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3821]!, self._r[3821]!, [_0]) + return formatWithArgumentRanges(self._s[3827]!, self._r[3827]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3822]!, self._r[3822]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3828]!, self._r[3828]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3823]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[3824]! } - public var VoiceOver_Navigation_Compose: String { return self._s[3825]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3826]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3828]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3829]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3829]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[3830]! } + public var VoiceOver_Navigation_Compose: String { return self._s[3831]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3832]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[3834]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3835]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3830]!, self._r[3830]!, [_1, _2]) - } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3832]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0]) - } - public var DialogList_Unread: String { return self._s[3835]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3836]!, self._r[3836]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[3837]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3838]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3838]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3840]!, self._r[3840]!, [_0]) + } + public var DialogList_Unread: String { return self._s[3841]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_1, _2]) + } + public var User_DeletedAccount: String { return self._s[3843]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3844]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3839]!, self._r[3839]!, [_0]) + return formatWithArgumentRanges(self._s[3845]!, self._r[3845]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[3840]! } - public var SharedMedia_CategoryMedia: String { return self._s[3841]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3842]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3843]! } - public var Watch_ChatList_Compose: String { return self._s[3844]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3845]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3846]! } - public var Watch_Microphone_Access: String { return self._s[3847]! } - public var Group_Setup_HistoryHeader: String { return self._s[3848]! } - public var Map_SetThisLocation: String { return self._s[3849]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3850]! } - public var Activity_UploadingPhoto: String { return self._s[3851]! } - public var Conversation_Edit: String { return self._s[3853]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[3854]! } - public var Login_TermsOfServiceDecline: String { return self._s[3855]! } - public var Message_PinnedContactMessage: String { return self._s[3856]! } + public var UserInfo_NotificationsDefault: String { return self._s[3846]! } + public var SharedMedia_CategoryMedia: String { return self._s[3847]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3848]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3849]! } + public var Watch_ChatList_Compose: String { return self._s[3850]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3851]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3852]! } + public var Watch_Microphone_Access: String { return self._s[3853]! } + public var Group_Setup_HistoryHeader: String { return self._s[3854]! } + public var Map_SetThisLocation: String { return self._s[3855]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3856]! } + public var Activity_UploadingPhoto: String { return self._s[3857]! } + public var Conversation_Edit: String { return self._s[3859]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[3860]! } + public var Login_TermsOfServiceDecline: String { return self._s[3861]! } + public var Message_PinnedContactMessage: String { return self._s[3862]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_1, _2]) - } - public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_1, _2, _3, _4, _5]) - } - public var Appearance_LargeEmoji: String { return self._s[3859]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[3861]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[3862]! } - public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3863]!, self._r[3863]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3864]! } - public var Message_PinnedPhotoMessage: String { return self._s[3865]! } - public var Passport_FieldPhone: String { return self._s[3866]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3867]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[3868]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[3870]! } - public var Conversation_Call: String { return self._s[3871]! } - public var Common_TakePhoto: String { return self._s[3873]! } - public var Group_EditAdmin_RankTitle: String { return self._s[3874]! } - public var Wallet_Receive_CommentHeader: String { return self._s[3875]! } - public var Channel_NotificationLoading: String { return self._s[3876]! } + public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3864]!, self._r[3864]!, [_1, _2, _3, _4, _5]) + } + public var Appearance_LargeEmoji: String { return self._s[3865]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[3867]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[3868]! } + public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3869]!, self._r[3869]!, [_1, _2]) + } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3870]! } + public var Message_PinnedPhotoMessage: String { return self._s[3871]! } + public var Passport_FieldPhone: String { return self._s[3872]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3873]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[3874]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[3876]! } + public var Conversation_Call: String { return self._s[3877]! } + public var Common_TakePhoto: String { return self._s[3879]! } + public var Group_EditAdmin_RankTitle: String { return self._s[3880]! } + public var Wallet_Receive_CommentHeader: String { return self._s[3881]! } + public var Channel_NotificationLoading: String { return self._s[3882]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3877]!, self._r[3877]!, [_0]) + return formatWithArgumentRanges(self._s[3883]!, self._r[3883]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_0]) + return formatWithArgumentRanges(self._s[3884]!, self._r[3884]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_1]) + return formatWithArgumentRanges(self._s[3885]!, self._r[3885]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[3880]! } + public var Permissions_SiriTitle_v0: String { return self._s[3886]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3881]!, self._r[3881]!, [_0]) + return formatWithArgumentRanges(self._s[3887]!, self._r[3887]!, [_0]) } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_0]) + return formatWithArgumentRanges(self._s[3888]!, self._r[3888]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[3883]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[3884]! } - public var Common_edit: String { return self._s[3885]! } - public var PrivacySettings_AuthSessions: String { return self._s[3886]! } - public var Month_ShortJune: String { return self._s[3887]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3888]! } - public var Call_ReportSend: String { return self._s[3889]! } - public var Watch_LastSeen_JustNow: String { return self._s[3890]! } - public var Notifications_MessageNotifications: String { return self._s[3891]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3892]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[3894]! } - public var Group_Status: String { return self._s[3895]! } + public var Channel_MessagePhotoRemoved: String { return self._s[3889]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[3890]! } + public var Common_edit: String { return self._s[3891]! } + public var PrivacySettings_AuthSessions: String { return self._s[3892]! } + public var Month_ShortJune: String { return self._s[3893]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3894]! } + public var Call_ReportSend: String { return self._s[3895]! } + public var Watch_LastSeen_JustNow: String { return self._s[3896]! } + public var Notifications_MessageNotifications: String { return self._s[3897]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3898]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3900]! } + public var Group_Status: String { return self._s[3901]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3896]!, self._r[3896]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[3897]! } - public var ShareMenu_ShareTo: String { return self._s[3898]! } - public var Conversation_Moderate_Ban: String { return self._s[3899]! } + public var TextFormat_AddLinkTitle: String { return self._s[3903]! } + public var ShareMenu_ShareTo: String { return self._s[3904]! } + public var Conversation_Moderate_Ban: String { return self._s[3905]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3900]!, self._r[3900]!, [_0]) - } - public var SharedMedia_ViewInChat: String { return self._s[3901]! } - public var Map_LiveLocationFor8Hours: String { return self._s[3902]! } - public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_1]) - } - public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_1, _2]) - } - public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3906]!, self._r[3906]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[3907]! } - public var Appearance_ReduceMotion: String { return self._s[3908]! } - public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3909]!, self._r[3909]!, [_1, _2]) + public var SharedMedia_ViewInChat: String { return self._s[3907]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3908]! } + public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3909]!, self._r[3909]!, [_1]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[3910]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[3911]! } - public var PhotoEditor_Skip: String { return self._s[3912]! } - public func Call_Minutes(_ value: Int32) -> String { + public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3910]!, self._r[3910]!, [_1, _2]) + } + public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3912]!, self._r[3912]!, [_0]) + } + public var Map_OpenInHereMaps: String { return self._s[3913]! } + public var Appearance_ReduceMotion: String { return self._s[3914]! } + public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3915]!, self._r[3915]!, [_1, _2]) + } + public var Channel_Setup_TypePublicHelp: String { return self._s[3916]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3917]! } + public var PhotoEditor_Skip: String { return self._s[3918]! } + public func Contacts_ImportersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Passport_Scans(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideoMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Theme_UsersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notification_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_Exceptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) - } - public func UserCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_SelectedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) - } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } public func Conversation_StatusOnline(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Seconds(_ value: Int32) -> String { + public func Media_ShareVideo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessagePoll_VotedCount(_ value: Int32) -> String { + public func StickerPack_AddMaskCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } public func MessageTimer_Hours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Theme_UsersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Conversation_SelectedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Years(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func UserCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) } public func InviteText_ContactsCountText(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Passport_Scans(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_File(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Months(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) } public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK index 76e8891f18..d30321feac 100644 --- a/submodules/TelegramUI/BUCK +++ b/submodules/TelegramUI/BUCK @@ -189,6 +189,7 @@ framework( "//submodules/WalletCore:WalletCore", "//submodules/Markdown:Markdown", "//submodules/SearchPeerMembers:SearchPeerMembers", + "//submodules/WidgetItems:WidgetItems", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 5672627924ba8e743945907e1d7e1d3bb0531403..8570b5ebff9b8b781a65d1954258f354836a1978 100644 GIT binary patch delta 40207 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%0AS7?_R_bws^1+8__qQ4RBNXd&Vc$Bv6F#Q! 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 Date: Fri, 11 Oct 2019 17:34:25 +0400 Subject: [PATCH 30/34] Fx pinned message panel glitch --- .../TelegramUI/TelegramUI/ChatHistoryListNode.swift | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 5fc70272d1..387ebebb9f 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -55,11 +55,11 @@ public struct ChatHistoryCombinedInitialReadStateData { } public struct ChatHistoryCombinedInitialData { - let initialData: InitialMessageHistoryData? - let buttonKeyboardMessage: Message? - let cachedData: CachedPeerData? - let cachedDataMessages: [MessageId: Message]? - let readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]? + var initialData: InitialMessageHistoryData? + var buttonKeyboardMessage: Message? + var cachedData: CachedPeerData? + var cachedDataMessages: [MessageId: Message]? + var readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]? } enum ChatHistoryViewUpdate { @@ -604,6 +604,8 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { if let strongSelf = self { if !strongSelf.didSetInitialData { strongSelf.didSetInitialData = true + var combinedInitialData = combinedInitialData + combinedInitialData?.cachedData = nil strongSelf._initialData.set(.single(combinedInitialData)) } From 3cf7c9931d7f744f7eb1da271d1e8b66175adf9d Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 19:00:36 +0400 Subject: [PATCH 31/34] Improve standalone modal presentation --- .../Navigation/NavigationController.swift | 7 ++++++- .../Navigation/NavigationModalContainer.swift | 21 ++++++++++++------- .../TelegramUI/ChatController.swift | 12 ++++++++++- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift index 24890663da..959fc71b99 100644 --- a/submodules/Display/Display/Navigation/NavigationController.swift +++ b/submodules/Display/Display/Navigation/NavigationController.swift @@ -532,6 +532,7 @@ open class NavigationController: UINavigationController, ContainableController, var previousModalContainer: NavigationModalContainer? var visibleModalCount = 0 + var hasVisibleStandaloneModal = false var topModalDismissProgress: CGFloat = 0.0 for i in (0 ..< navigationLayout.modal.count).reversed() { @@ -577,9 +578,13 @@ open class NavigationController: UINavigationController, ContainableController, } if modalContainer.supernode != nil { - if !isStandaloneModal || visibleModalCount != 0 { + if !hasVisibleStandaloneModal && !isStandaloneModal { visibleModalCount += 1 } + if isStandaloneModal { + hasVisibleStandaloneModal = true + visibleModalCount = 0 + } if previousModalContainer == nil { topModalDismissProgress = modalContainer.dismissProgress if case .compact = layout.metrics.widthClass { diff --git a/submodules/Display/Display/Navigation/NavigationModalContainer.swift b/submodules/Display/Display/Navigation/NavigationModalContainer.swift index 1b4d433e8e..87f3464f4e 100644 --- a/submodules/Display/Display/Navigation/NavigationModalContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationModalContainer.swift @@ -334,20 +334,25 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes var topInset: CGFloat if isStandaloneModal { topInset = 0.0 + containerLayout = layout + + let unscaledFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: containerLayout.size) + containerScale = 1.0 + containerFrame = unscaledFrame } else { topInset = 10.0 if let statusBarHeight = layout.statusBarHeight { topInset += statusBarHeight } + + containerLayout = ContainerViewLayout(size: CGSize(width: layout.size.width, height: layout.size.height - topInset), metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: layout.intrinsicInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.intrinsicInsets.right), safeInsets: UIEdgeInsets(top: 0.0, left: layout.safeInsets.left, bottom: layout.safeInsets.bottom, right: layout.safeInsets.right), statusBarHeight: nil, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) + let unscaledFrame = CGRect(origin: CGPoint(x: 0.0, y: topInset - coveredByModalTransition * 10.0), size: containerLayout.size) + let maxScale: CGFloat = (containerLayout.size.width - 16.0 * 2.0) / containerLayout.size.width + containerScale = 1.0 * (1.0 - coveredByModalTransition) + maxScale * coveredByModalTransition + let maxScaledTopInset: CGFloat = topInset - 10.0 + let scaledTopInset: CGFloat = topInset * (1.0 - coveredByModalTransition) + maxScaledTopInset * coveredByModalTransition + containerFrame = unscaledFrame.offsetBy(dx: 0.0, dy: scaledTopInset - (unscaledFrame.midY - containerScale * unscaledFrame.height / 2.0)) } - - containerLayout = ContainerViewLayout(size: CGSize(width: layout.size.width, height: layout.size.height - topInset), metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: layout.intrinsicInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.intrinsicInsets.right), safeInsets: UIEdgeInsets(top: 0.0, left: layout.safeInsets.left, bottom: layout.safeInsets.bottom, right: layout.safeInsets.right), statusBarHeight: nil, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) - let unscaledFrame = CGRect(origin: CGPoint(x: 0.0, y: topInset - coveredByModalTransition * 10.0), size: containerLayout.size) - let maxScale: CGFloat = (containerLayout.size.width - 16.0 * 2.0) / containerLayout.size.width - containerScale = 1.0 * (1.0 - coveredByModalTransition) + maxScale * coveredByModalTransition - let maxScaledTopInset: CGFloat = topInset - 10.0 - let scaledTopInset: CGFloat = topInset * (1.0 - coveredByModalTransition) + maxScaledTopInset * coveredByModalTransition - containerFrame = unscaledFrame.offsetBy(dx: 0.0, dy: scaledTopInset - (unscaledFrame.midY - containerScale * unscaledFrame.height / 2.0)) case .regular: self.panRecognizer?.isEnabled = false self.dim.backgroundColor = UIColor(white: 0.0, alpha: 0.4) diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 2fb48cc767..f64d8fe31a 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -4488,6 +4488,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G print() } + switch self.presentationInterfaceState.mode { + case .standard, .inline: + break + case .overlay: + if layout.safeInsets.top.isZero { + self.statusBar.statusBarStyle = .Hide + } else { + self.statusBar.statusBarStyle = .Ignore + } + } + self.chatDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition, listViewTransaction: { updateSizeAndInsets, additionalScrollDistance, scrollToTop, completion in self.chatDisplayNode.historyNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets, additionalScrollDistance: additionalScrollDistance, scrollToTop: scrollToTop, completion: completion) }) @@ -4823,7 +4834,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style self.deferScreenEdgeGestures = [] case .overlay: - self.statusBar.statusBarStyle = .Hide self.deferScreenEdgeGestures = [.top] case .inline: self.statusBar.statusBarStyle = .Ignore From abd2a848aaff48e63426be2a24c8ac82cefe56d9 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 20:26:01 +0400 Subject: [PATCH 32/34] Display pending transaction --- .../WalletCore/Sources/WalletCore.swift | 17 +- .../WalletUI/Sources/WalletInfoScreen.swift | 3 +- .../WalletUI/Sources/WalletSplashScreen.swift | 180 +++++++++++++++--- 3 files changed, 163 insertions(+), 37 deletions(-) diff --git a/submodules/WalletCore/Sources/WalletCore.swift b/submodules/WalletCore/Sources/WalletCore.swift index b376a546ec..f90c6fab31 100644 --- a/submodules/WalletCore/Sources/WalletCore.swift +++ b/submodules/WalletCore/Sources/WalletCore.swift @@ -747,12 +747,12 @@ public enum SendGramsFromWalletError { case network } -public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: TonInstance, walletInfo: WalletInfo, decryptedSecret: Data, localPassword: Data, toAddress: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal<[PendingWalletTransaction], SendGramsFromWalletError> { +public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: TonInstance, walletInfo: WalletInfo, decryptedSecret: Data, localPassword: Data, toAddress: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal { return walletAddress(publicKey: walletInfo.publicKey, tonInstance: tonInstance) |> castError(SendGramsFromWalletError.self) - |> mapToSignal { fromAddress -> Signal<[PendingWalletTransaction], SendGramsFromWalletError> in + |> mapToSignal { fromAddress -> Signal in return tonInstance.sendGramsFromWallet(decryptedSecret: decryptedSecret, localPassword: localPassword, walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout, randomId: randomId) - |> mapToSignal { result -> Signal<[PendingWalletTransaction], SendGramsFromWalletError> in + |> mapToSignal { result -> Signal in return storage.updateWalletRecords { records in var records = records for i in 0 ..< records.count { @@ -765,15 +765,8 @@ public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: To } return records } - |> map { records -> [PendingWalletTransaction] in - for i in 0 ..< records.count { - if records[i].info.publicKey == walletInfo.publicKey { - if let state = records[i].state { - return state.pendingTransactions - } - } - } - return [] + |> map { _ -> PendingWalletTransaction in + return result } |> castError(SendGramsFromWalletError.self) } diff --git a/submodules/WalletUI/Sources/WalletInfoScreen.swift b/submodules/WalletUI/Sources/WalletInfoScreen.swift index 4d0ad468eb..b780565512 100644 --- a/submodules/WalletUI/Sources/WalletInfoScreen.swift +++ b/submodules/WalletUI/Sources/WalletInfoScreen.swift @@ -478,7 +478,6 @@ private func preparedTransition(from fromEntries: [WalletInfoListEntry], to toEn return WalletInfoListTransaction(deletions: deletions, insertions: insertions, updates: updates) } - private final class WalletInfoScreenNode: ViewControllerTracingNode { private let context: WalletContext private var presentationData: WalletPresentationData @@ -649,7 +648,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode { } |> then( Signal.complete() - |> delay(10.0, queue: .mainQueue()) + |> delay(5.0, queue: .mainQueue()) ) ) |> restart diff --git a/submodules/WalletUI/Sources/WalletSplashScreen.swift b/submodules/WalletUI/Sources/WalletSplashScreen.swift index b78fd147fe..9648d14561 100644 --- a/submodules/WalletUI/Sources/WalletSplashScreen.swift +++ b/submodules/WalletUI/Sources/WalletSplashScreen.swift @@ -35,6 +35,8 @@ public final class WalletSplashScreen: ViewController { private let walletCreatedPreloadState: Promise? + private let actionDisposable = MetaDisposable() + public init(context: WalletContext, mode: WalletSplashMode, walletCreatedPreloadState: Promise?) { self.context = context self.mode = mode @@ -119,6 +121,10 @@ public final class WalletSplashScreen: ViewController { fatalError("init(coder:) has not been implemented") } + deinit { + self.actionDisposable.dispose() + } + @objc private func backPressed() { self.dismiss() } @@ -129,7 +135,85 @@ public final class WalletSplashScreen: ViewController { private func sendGrams(walletInfo: WalletInfo, decryptedSecret: Data, address: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, randomId: Int64, serverSalt: Data) { let _ = (sendGramsFromWallet(storage: self.context.storage, tonInstance: self.context.tonInstance, walletInfo: walletInfo, decryptedSecret: decryptedSecret, localPassword: serverSalt, toAddress: address, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: 0, randomId: randomId) - |> deliverOnMainQueue).start(error: { [weak self] error in + |> deliverOnMainQueue).start(next: { [weak self] sentTransaction in + guard let strongSelf = self else { + return + } + + strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Wallet_WordImport_Continue, style: .plain, target: strongSelf, action: #selector(strongSelf.sendGramsContinuePressed)), animated: false) + + let check = getCombinedWalletState(storage: strongSelf.context.storage, subject: .wallet(walletInfo), tonInstance: strongSelf.context.tonInstance) + |> mapToSignal { state -> Signal in + switch state { + case .cached: + return .complete() + case let .updated(state): + if !state.pendingTransactions.contains(where: { $0.bodyHash == sentTransaction.bodyHash }) { + return .single(true) + } else { + return .complete() + } + } + } + |> then( + .complete() + |> delay(3.0, queue: .concurrentDefaultQueue()) + ) + |> restart + |> take(1) + + strongSelf.actionDisposable.set(check.start(error: { _ in + guard let strongSelf = self else { + return + } + if let navigationController = strongSelf.navigationController as? NavigationController { + let _ = (walletAddress(publicKey: walletInfo.publicKey, tonInstance: strongSelf.context.tonInstance) + |> deliverOnMainQueue).start(next: { [weak self] address in + guard let strongSelf = self else { + return + } + var controllers: [UIViewController] = [] + for controller in navigationController.viewControllers { + if let controller = controller as? WalletInfoScreen { + let infoScreen = WalletInfoScreen(context: strongSelf.context, walletInfo: walletInfo, address: address, enableDebugActions: false) + infoScreen.navigationPresentation = controller.navigationPresentation + controllers.append(infoScreen) + } else { + controllers.append(controller) + } + } + controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo, amount), walletCreatedPreloadState: nil)) + strongSelf.view.endEditing(true) + navigationController.setViewControllers(controllers, animated: true) + }) + } + }, completed: { + guard let strongSelf = self else { + return + } + if let navigationController = strongSelf.navigationController as? NavigationController { + let _ = (walletAddress(publicKey: walletInfo.publicKey, tonInstance: strongSelf.context.tonInstance) + |> deliverOnMainQueue).start(next: { [weak self] address in + guard let strongSelf = self else { + return + } + var controllers: [UIViewController] = [] + for controller in navigationController.viewControllers { + if let controller = controller as? WalletInfoScreen { + let infoScreen = WalletInfoScreen(context: strongSelf.context, walletInfo: walletInfo, address: address, enableDebugActions: false) + infoScreen.navigationPresentation = controller.navigationPresentation + controllers.append(infoScreen) + } else { + controllers.append(controller) + } + } + controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo, amount), walletCreatedPreloadState: nil)) + strongSelf.view.endEditing(true) + navigationController.setViewControllers(controllers, animated: true) + }) + } + })) + }, error: { [weak self] error in guard let strongSelf = self else { return } @@ -177,32 +261,48 @@ public final class WalletSplashScreen: ViewController { } })]) strongSelf.present(controller, in: .window(.root)) - }, completed: { [weak self] in - guard let strongSelf = self else { - return - } - if let navigationController = strongSelf.navigationController as? NavigationController { - let _ = (walletAddress(publicKey: walletInfo.publicKey, tonInstance: strongSelf.context.tonInstance) + }) + } + + @objc private func sendGramsContinuePressed() { + switch self.mode { + case let .sending(sending): + if let navigationController = self.navigationController as? NavigationController { + var controllers = navigationController.viewControllers + controllers = controllers.filter { controller in + if controller is WalletSendScreen { + return false + } + if controller is WalletSplashScreen { + return false + } + if controller is WalletWordDisplayScreen { + return false + } + if controller is WalletWordCheckScreen { + return false + } + return true + } + + let _ = (walletAddress(publicKey: sending.0.publicKey, tonInstance: self.context.tonInstance) |> deliverOnMainQueue).start(next: { [weak self] address in guard let strongSelf = self else { return } - var controllers: [UIViewController] = [] - for controller in navigationController.viewControllers { - if let controller = controller as? WalletInfoScreen { - let infoScreen = WalletInfoScreen(context: strongSelf.context, walletInfo: walletInfo, address: address, enableDebugActions: false) - infoScreen.navigationPresentation = controller.navigationPresentation - controllers.append(infoScreen) - } else { - controllers.append(controller) - } + + if !controllers.contains(where: { $0 is WalletInfoScreen }) { + let infoScreen = WalletInfoScreen(context: strongSelf.context, walletInfo: sending.0, address: address, enableDebugActions: false) + infoScreen.navigationPresentation = .modal + controllers.append(infoScreen) } - controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo, amount), walletCreatedPreloadState: nil)) strongSelf.view.endEditing(true) navigationController.setViewControllers(controllers, animated: true) }) } - }) + default: + break + } } override public func loadDisplayNode() { @@ -422,8 +522,40 @@ public final class WalletSplashScreen: ViewController { strongSelf.view.endEditing(true) navigationController.setViewControllers(controllers, animated: true) } - case .sending: - break + case let .sending(sending): + if let navigationController = strongSelf.navigationController as? NavigationController { + var controllers = navigationController.viewControllers + controllers = controllers.filter { controller in + if controller is WalletSendScreen { + return false + } + if controller is WalletSplashScreen { + return false + } + if controller is WalletWordDisplayScreen { + return false + } + if controller is WalletWordCheckScreen { + return false + } + return true + } + + let _ = (walletAddress(publicKey: sending.0.publicKey, tonInstance: strongSelf.context.tonInstance) + |> deliverOnMainQueue).start(next: { [weak self] address in + guard let strongSelf = self else { + return + } + + if !controllers.contains(where: { $0 is WalletInfoScreen }) { + let infoScreen = WalletInfoScreen(context: strongSelf.context, walletInfo: sending.0, address: address, enableDebugActions: false) + infoScreen.navigationPresentation = .modal + controllers.append(infoScreen) + } + strongSelf.view.endEditing(true) + navigationController.setViewControllers(controllers, animated: true) + }) + } case .secureStorageNotAvailable: strongSelf.dismiss() case let .secureStorageReset(reason): @@ -494,7 +626,7 @@ private final class WalletSplashScreenNode: ViewControllerTracingNode { private let alternativeAnimationNode: AnimatedStickerNode private let titleNode: ImmediateTextNode private let textNode: ImmediateTextNode - private let buttonNode: SolidRoundedButtonNode + let buttonNode: SolidRoundedButtonNode private let termsNode: ImmediateTextNode private let secondaryActionTitleNode: ImmediateTextNode private let secondaryActionButtonNode: HighlightTrackingButtonNode @@ -521,6 +653,7 @@ private final class WalletSplashScreenNode: ViewControllerTracingNode { let title: String let text: NSAttributedString let buttonText: String + var buttonHidden: Bool = false let termsText: NSAttributedString let secondaryActionText: String @@ -582,7 +715,8 @@ private final class WalletSplashScreenNode: ViewControllerTracingNode { case .sending: title = self.presentationData.strings.Wallet_Sending_Title text = NSAttributedString(string: self.presentationData.strings.Wallet_Sending_Text, font: textFont, textColor: textColor) - buttonText = "" + buttonText = self.presentationData.strings.Wallet_Sent_Title + buttonHidden = true termsText = NSAttributedString(string: "") self.iconNode.image = nil if let path = getAppBundle().path(forResource: "SendingGrams", ofType: "tgs") { @@ -690,7 +824,7 @@ private final class WalletSplashScreenNode: ViewControllerTracingNode { self.secondaryActionButtonNode = HighlightTrackingButtonNode() self.buttonNode = SolidRoundedButtonNode(title: buttonText, theme: SolidRoundedButtonTheme(backgroundColor: self.presentationData.theme.setup.buttonFillColor, foregroundColor: self.presentationData.theme.setup.buttonForegroundColor), height: 50.0, cornerRadius: 10.0, gloss: false) - self.buttonNode.isHidden = buttonText.isEmpty + self.buttonNode.isHidden = buttonText.isEmpty || buttonHidden super.init() From 3be4e6a22ef05a27a01d2aa6dc18852bec809c35 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 20:47:35 +0400 Subject: [PATCH 33/34] Fix build --- submodules/SelectablePeerNode/BUCK | 1 + 1 file changed, 1 insertion(+) diff --git a/submodules/SelectablePeerNode/BUCK b/submodules/SelectablePeerNode/BUCK index a7aee01d3c..2cfe2c97ea 100644 --- a/submodules/SelectablePeerNode/BUCK +++ b/submodules/SelectablePeerNode/BUCK @@ -16,6 +16,7 @@ static_library( "//submodules/AvatarNode:AvatarNode", "//submodules/LegacyComponents:LegacyComponents", "//submodules/ContextUI:ContextUI", + "//submodules/LocalizedPeerData:LocalizedPeerData", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", From cf4a1e8c26c6216802e414c3eb82622e38196c19 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Fri, 11 Oct 2019 21:05:19 +0400 Subject: [PATCH 34/34] Fix build on Xcode 10 --- .../Display/Display/Navigation/NavigationController.swift | 2 +- .../Display/Navigation/NavigationModalContainer.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift index 959fc71b99..3584a4beda 100644 --- a/submodules/Display/Display/Navigation/NavigationController.swift +++ b/submodules/Display/Display/Navigation/NavigationController.swift @@ -539,7 +539,7 @@ open class NavigationController: UINavigationController, ContainableController, let modalContainer = self.modalContainers[i] var isStandaloneModal = false - if case .standaloneModal = modalContainer.container.controllers.first?.navigationPresentation { + if let controller = modalContainer.container.controllers.first, case .standaloneModal = controller.navigationPresentation { isStandaloneModal = true } diff --git a/submodules/Display/Display/Navigation/NavigationModalContainer.swift b/submodules/Display/Display/Navigation/NavigationModalContainer.swift index 87f3464f4e..7980c6d41f 100644 --- a/submodules/Display/Display/Navigation/NavigationModalContainer.swift +++ b/submodules/Display/Display/Navigation/NavigationModalContainer.swift @@ -290,7 +290,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes self.validLayout = layout var isStandaloneModal = false - if case .standaloneModal = controllers.first?.navigationPresentation { + if let controller = controllers.first, case .standaloneModal = controller.navigationPresentation { isStandaloneModal = true } @@ -384,7 +384,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes } func animateIn(transition: ContainedViewLayoutTransition) { - if case .standaloneModal = self.container.controllers.first?.navigationPresentation { + if let controller = self.container.controllers.first, case .standaloneModal = controller.navigationPresentation { } else { transition.updateAlpha(node: self.dim, alpha: 1.0) transition.animatePositionAdditive(node: self.container, offset: CGPoint(x: 0.0, y: self.bounds.height + self.container.bounds.height / 2.0 - (self.container.position.y - self.bounds.height))) @@ -396,7 +396,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes controller.viewWillDisappear(transition.isAnimated) } - if case .standaloneModal = self.container.controllers.first?.navigationPresentation { + if let firstController = self.container.controllers.first, case .standaloneModal = firstController.navigationPresentation { for controller in self.container.controllers { controller.setIgnoreAppearanceMethodInvocations(true) controller.displayNode.removeFromSupernode()