Merge commit 'f14ee93d860698594f9b9fa177eefc3822c8a914'

Author: Isaac

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13201,3 +13201,20 @@ Sorry for the inconvenience.";
 "Chat.ScheduledForceSendProcessingVideo.Title" = "Wait!";
 "Chat.ScheduledForceSendProcessingVideo.Text" = "This video hasn't been converted and optimized yet. If you send it now, the viewers of the video may experience slow download speed.";
 "Chat.ScheduledForceSendProcessingVideo.Action" = "Send Anyway";
+
+"Chat.HashtagSuggestion.UseGeneric.Title" = "Use %@";
+"Chat.HashtagSuggestion.UseGeneric.Text" = "searches posts from all channels";
+
+"Chat.HashtagSuggestion.UseLocal.Title" = "Use %@";
+"Chat.HashtagSuggestion.UseLocal.Channel.Text" = "searches only posts from this channel";
+"Chat.HashtagSuggestion.UseLocal.Group.Text" = "searches only posts from this group";
+
+"Gift.Convert.Period.Text" = "Do you want to convert this gift from **%1$@** to **%2$@**?\n\nConversion is available for the next %3$@.\n\nThis will permanently destroy the gift.";
+"Gift.Convert.Period.Stars_1" = "%@ Star";
+"Gift.Convert.Period.Stars_any" = "%@ Stars";
+"Gift.Convert.Period.Days_1" = "%@ day";
+"Gift.Convert.Period.Days_any" = "%@ days";
+
+"Gift.Convert.Period.Unavailable.Text" = "Sorry, you can't convert this gift.\n\nStars can only be claimed within %@ after receiving a gift.";
+"Gift.Convert.Period.Unavailable.Days_1" = "%@ day";
+"Gift.Convert.Period.Unavailable.Days_any" = "%@ days";

submodules/TelegramUI/Components/Chat/ChatInputContextPanelNode/Sources/ChatInputContextPanelNode.swift

@@ -19,11 +19,13 @@ open class ChatInputContextPanelNode: ASDisplayNode {
     open var interfaceInteraction: ChatPanelInterfaceInteraction?
     open var placement: ChatInputContextPanelPlacement = .overPanels
     open var theme: PresentationTheme
+    open var strings: PresentationStrings
     open var fontSize: PresentationFontSize
 
     public init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, chatPresentationContext: ChatPresentationContext) {
         self.context = context
         self.theme = theme
+        self.strings = strings
         self.fontSize = fontSize
 
         super.init()

submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift

@@ -557,7 +557,7 @@ private final class GiftViewSheetContent: CombinedComponent {
                 ))
             }
 
-            if savedToProfile {
+            if incoming && savedToProfile {
                 tableItems.append(.init(
                     id: "visibility",
                     title: strings.Gift_View_Visibility,
@@ -1028,19 +1028,11 @@ public class GiftViewScreen: ViewControllerComponentContainer {
             let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
 
             if currentTime > starsConvertMaxDate {
-                //TODO:localize
-                
-                let duration: String
-                if starsConvertMaxDate == 300 {
-                    duration = "5 minutes"
-                } else {
-                    duration = "90 days"
-                }
-                
+                let days: Int32 = Int32(ceil(Float(configuration.convertToStarsPeriod) / 86400.0))
                 let controller = textAlertController(
                     context: self.context,
                     title: presentationData.strings.Gift_Convert_Title,
-                    text: "Sorry, you can't convert this gift.\n\nStars can only be claimed within \(duration) after receiving a gift.",
+                    text: presentationData.strings.Gift_Convert_Period_Unavailable_Text(presentationData.strings.Gift_Convert_Period_Unavailable_Days(days)).string,
                     actions: [
                         TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})
                     ],
@@ -1049,14 +1041,9 @@ public class GiftViewScreen: ViewControllerComponentContainer {
                 self.present(controller, in: .window(.root))
             } else {
                 let delta = starsConvertMaxDate - currentTime
-                let duration: String
-                if starsConvertMaxDate == 300 {
-                    duration = "\(delta / 60) minutes"
-                } else {
-                    duration = "\(delta / 86400) days"
-                }
-                //TODO:localize
-                let text = "Do you want to convert this gift from **\(fromPeerName)** to **\(presentationData.strings.Gift_Convert_Stars(Int32(arguments.convertStars)))**?\n\nConversion is available for the next \(duration).\n\nThis will permanently destroy the gift."
+                let days: Int32 = Int32(ceil(Float(delta) / 86400.0))
+                
+                let text = presentationData.strings.Gift_Convert_Period_Text(fromPeerName, presentationData.strings.Gift_Convert_Period_Stars(Int32(arguments.convertStars)), presentationData.strings.Gift_Convert_Period_Days(days)).string
                 let controller = textAlertController(
                     context: self.context,
                     title: presentationData.strings.Gift_Convert_Title,

submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/ContextResultPanelComponent.swift

@@ -233,7 +233,6 @@ final class ContextResultPanelComponent: Component {
                         }
 
                         if let peer, let addressName = peer.addressName, hashtagIndex < 0 {
-                            //TODO: localize
                             var isGroup = false
                             if case let .channel(channel) = peer, case .group = channel.info {
                                 isGroup = true
@@ -245,8 +244,8 @@ final class ContextResultPanelComponent: Component {
                                     theme: component.theme,
                                     strings: component.strings,
                                     peer: nil,
-                                    title: "Use #\(query)",
-                                    subtitle: "searches posts from all channels",
+                                    title: component.strings.Chat_HashtagSuggestion_UseGeneric_Title("#\(query)").string,
+                                    subtitle: component.strings.Chat_HashtagSuggestion_UseGeneric_Text,
                                     hashtag: query,
                                     hasNext: index != hashtags.count - 1,
                                     action: { [weak self] hashtag, _ in
@@ -262,8 +261,8 @@ final class ContextResultPanelComponent: Component {
                                     theme: component.theme,
                                     strings: component.strings,
                                     peer: peer,
-                                    title: "Use #\(query)@\(addressName)",
-                                    subtitle: isGroup ? "searches only posts from this group" : "searches only posts from this channel",
+                                    title: component.strings.Chat_HashtagSuggestion_UseLocal_Title("#\(query)@\(addressName)").string,
+                                    subtitle: isGroup ? component.strings.Chat_HashtagSuggestion_UseLocal_Group_Text : component.strings.Chat_HashtagSuggestion_UseLocal_Channel_Text,
                                     hashtag: "\(query)@\(addressName)",
                                     hasNext: index != hashtags.count - 1,
                                     action: { [weak self] hashtag, _ in

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift

@@ -74,7 +74,7 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
         if !icons.isEmpty {
             if self.iconLayers.isEmpty {
                 for icon in icons {
-                    let iconSize = CGSize(width: 24.0, height: 24.0)
+                    let iconSize = CGSize(width: 18.0, height: 18.0)
 
                     let emoji = ChatTextInputTextCustomEmojiAttribute(
                         interactivelySelectedFromPackId: nil,
@@ -121,11 +121,11 @@ final class PeerInfoPaneTabsContainerPaneNode: ASDisplayNode {
         totalWidth = titleSize.width
 
         if !self.iconLayers.isEmpty {
-            totalWidth += 1.0
-            let iconSize = CGSize(width: 24.0, height: 24.0)
+            totalWidth += 2.0
+            let iconSize = CGSize(width: 18.0, height: 18.0)
             let spacing: CGFloat = 1.0
             for iconlayer in self.iconLayers {
-                iconlayer.frame = CGRect(origin: CGPoint(x: totalWidth, y: 12.0), size: iconSize)
+                iconlayer.frame = CGRect(origin: CGPoint(x: totalWidth, y: 15.0), size: iconSize)
                 totalWidth += iconSize.width + spacing
             }
             totalWidth -= spacing

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift

@@ -1513,7 +1513,6 @@ private func infoItems(data: PeerInfoScreenData?, context: AccountContext, prese
                 let overallStarsBalance = data.starsRevenueStatsState?.balances.overallRevenue ?? 0
 
                 if overallRevenueBalance > 0 || overallStarsBalance > 0 {
-                    //TODO:localize
                     items[.balances]!.append(PeerInfoScreenHeaderItem(id: 20, text: presentationData.strings.PeerInfo_BotBalance_Title))
                     if overallRevenueBalance > 0 {
                         let string = "*\(formatTonAmountText(revenueBalance, dateTimeFormat: presentationData.dateTimeFormat))"

submodules/TelegramUI/Components/Stars/StarsTransactionScreen/Sources/StarsTransactionScreen.swift

@@ -947,8 +947,10 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                                 return nil
                             }
                         },
-                        tapAction: { _, _ in
-                            openAppExamples()
+                        tapAction: { attributes, _ in
+                            if let _ = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.URL)] {
+                                openAppExamples()
+                            }
                         }
                     ),
                     availableSize: CGSize(width: context.availableSize.width - sideInset * 2.0 - 60.0, height: CGFloat.greatestFiniteMagnitude),

submodules/TelegramUI/Sources/ChatAdPanelNode.swift

@@ -338,6 +338,8 @@ final class ChatAdPanelNode: ASDisplayNode {
         if let imageDimensions {
             applyImage = imageNodeLayout(TransformImageArguments(corners: ImageCorners(radius: 3.0), imageSize: imageDimensions.aspectFilled(imageBoundingSize), boundingSize: imageBoundingSize, intrinsicInsets: UIEdgeInsets()))
             textRightInset += imageBoundingSize.width + 18.0
+        } else {
+            textRightInset = 27.0
         }
 
         var mediaUpdated = false

submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift

@@ -120,15 +120,14 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode {
         if let peer, let _ = peer.addressName {
             isAdditionalRecent = true
         }
-        //TODO:localize
-        if query.count > 3 {
+        if query.count >= 4 {
             if let peer, let addressName = peer.addressName {
                 let genericEntry = HashtagChatInputContextPanelEntry(
                     index: 0,
                     theme: self.theme,
                     peer: nil,
-                    title: "Use #\(query)",
-                    text: "searches posts from all channels",
+                    title: self.strings.Chat_HashtagSuggestion_UseGeneric_Title("#\(query)").string,
+                    text: self.strings.Chat_HashtagSuggestion_UseGeneric_Text,
                     badge: nil,
                     hashtag: query,
                     revealed: false,
@@ -145,9 +144,9 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode {
                     index: 1,
                     theme: self.theme,
                     peer: peer,
-                    title: "Use #\(query)@\(addressName)",
-                    text: isGroup ? "searches only posts from this group" : "searches only posts from this channel",
-                    badge: "NEW",
+                    title: self.strings.Chat_HashtagSuggestion_UseLocal_Title("#\(query)@\(addressName)").string,
+                    text: isGroup ? self.strings.Chat_HashtagSuggestion_UseLocal_Group_Text : self.strings.Chat_HashtagSuggestion_UseLocal_Channel_Text,
+                    badge: self.strings.ChatList_ContextMenuBadgeNew,
                     hashtag: "\(query)@\(addressName)",
                     revealed: false,
                     isAdditionalRecent: false

submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift

@@ -82,8 +82,6 @@ private func preparedTransition(from fromEntries: [HorizontalListContextResultsC
 }
 
 final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputContextPanelNode {
-    private var strings: PresentationStrings
-    
     private let listView: ListView
     private let separatorNode: ASDisplayNode
     private var currentExternalResults: ChatContextResultCollection?
@@ -96,8 +94,6 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
     private var hasValidLayout = false
 
     override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, chatPresentationContext: ChatPresentationContext) {
-        self.strings = strings
-        
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
         self.separatorNode.backgroundColor = theme.list.itemPlainSeparatorColor