diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index 9aea810170..10ee27b4bb 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -7886,11 +7886,11 @@ Sorry for the inconvenience."; "EmojiPackActionInfo.ArchivedTitle" = "Emoji Archived"; "EmojiPackActionInfo.RemovedText" = "%@ is no longer in your emoji."; -"EmojiPackActionInfo.MultipleAddedText_1" = "%@ pack has been added to your emoji."; -"EmojiPackActionInfo.MultipleAddedText_any" = "%@ packs have been added to your emoji."; +"EmojiPackActionInfo.MultipleAddedText_1" = "%@ emoji pack has been added to your emoji."; +"EmojiPackActionInfo.MultipleAddedText_any" = "%@ emoji packs have been added to your emoji."; -"EmojiPackActionInfo.MultipleRemovedText_1" = "%@ pack is no longer in your emoji."; -"EmojiPackActionInfo.MultipleRemovedText_any" = "%@ packs are no longer in your emoji."; +"EmojiPackActionInfo.MultipleRemovedText_1" = "%@ emoji pack is no longer in your emoji."; +"EmojiPackActionInfo.MultipleRemovedText_any" = "%@ emoji packs are no longer in your emoji."; "MaskPackActionInfo.RemovedTitle" = "Masks Removed"; "MaskPackActionInfo.ArchivedTitle" = "Masks Archived"; diff --git a/submodules/PremiumUI/Resources/smilie.png b/submodules/PremiumUI/Resources/smilie.png index e88beb0022..8de30d8842 100644 Binary files a/submodules/PremiumUI/Resources/smilie.png and b/submodules/PremiumUI/Resources/smilie.png differ diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 132c6f37d9..50afc6da07 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -1136,7 +1136,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if actions.count > 1, let first = actions.first { if case .add = first.2 { - strongSelf.presentInGlobalOverlay(UndoOverlayController(presentationData: presentationData, content: .actionSucceeded(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), cancel: ""), elevatedLayout: true, animateInAsReplacement: false, action: { _ in + strongSelf.presentInGlobalOverlay(UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), undo: false, info: first.0, topItem: first.1.first, context: context), elevatedLayout: true, animateInAsReplacement: false, action: { _ in return true })) } diff --git a/submodules/TelegramUI/Sources/OpenChatMessage.swift b/submodules/TelegramUI/Sources/OpenChatMessage.swift index 09118aa5dc..a57005050b 100644 --- a/submodules/TelegramUI/Sources/OpenChatMessage.swift +++ b/submodules/TelegramUI/Sources/OpenChatMessage.swift @@ -83,7 +83,7 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool { if actions.count > 1, let first = actions.first { if case .add = first.2 { - params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .actionSucceeded(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), cancel: ""), elevatedLayout: true, animateInAsReplacement: false, action: { _ in + params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), undo: false, info: first.0, topItem: first.1.first, context: params.context), elevatedLayout: true, animateInAsReplacement: false, action: { _ in return true })) } diff --git a/submodules/TelegramUI/Sources/OpenResolvedUrl.swift b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift index a945582f78..aca743fddd 100644 --- a/submodules/TelegramUI/Sources/OpenResolvedUrl.swift +++ b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift @@ -169,7 +169,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur let controller = StickerPackScreen(context: context, updatedPresentationData: updatedPresentationData, mainStickerPack: .name(name), stickerPacks: [.name(name)], parentNavigationController: navigationController, sendSticker: sendSticker, actionPerformed: { actions in if actions.count > 1, let first = actions.first { if case .add = first.2 { - present(UndoOverlayController(presentationData: presentationData, content: .actionSucceeded(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), cancel: ""), elevatedLayout: true, animateInAsReplacement: false, action: { _ in + present(UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.EmojiPackActionInfo_AddedTitle, text: presentationData.strings.EmojiPackActionInfo_MultipleAddedText(Int32(actions.count)), undo: false, info: first.0, topItem: first.1.first, context: context), elevatedLayout: true, animateInAsReplacement: false, action: { _ in return true }), nil) }