github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'c64653ed37'

Browse source
This commit is contained in:
Ilya Laktyushin 2026-05-14 12:45:26 +02:00
parent 7a7333edab
commit 91eb779ae2
614 changed files with 33270 additions and 37190 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Telegram/NotificationService/Sources/NotificationService.swift
View file

@ -1286,9 +1286,9 @@ private final class NotificationServiceHandler {
action = .pollStories(peerId: peerId, content: content, storyId: storyId, isReaction: isReaction)
} else {
var reportDelivery = false
if let reportDeliveryUntilDate = aps["report_delivery_until_date"] as? Int32 {
if let reportDeliveryUntilDate = aps["report_delivery_until_date"] as? String, let reportDeliveryUntilDateValue = Int32(reportDeliveryUntilDate) {
let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
if reportDeliveryUntilDate > currentTime {
if reportDeliveryUntilDateValue > currentTime {
reportDelivery = true
}
}

33
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View file

@ -2661,6 +2661,8 @@ Unused sets are archived when you add more.";
"Channel.EditAdmin.PermissionInviteViaLink" = "Invite Users via Link";
"Channel.EditAdmin.PermissionPinMessages" = "Pin Messages";
"Channel.EditAdmin.PermissionAddAdmins" = "Add New Admins";
"Channel.EditAdmin.PermissionProcessJoinRequests" = "Process Join Requests";
"Channel.EditAdmin.PermissionProcessJoinRequestsInfo" = "Allow this bot to approve new members using its own interfaces, such as captchas.";
"Channel.EditAdmin.PermissinAddAdminOn" = "This Admin will be able to add new admins with the same (or more limited) permissions.";
"Channel.EditAdmin.PermissinAddAdminOff" = "This Admin will not be able to add new admins.";
@ -2874,6 +2876,13 @@ Unused sets are archived when you add more.";
"Call.ReportSend" = "Send";
"Channel.EditAdmin.CannotEdit" = "You cannot edit the rights of this admin.";
"Channel.EditAdmin.GuardBotEnableMembersText" = "New members will now need approval from **%@** before they can send messages in this group";
"Channel.EditAdmin.GuardBotEnableSubscribersText" = "New subscribers will now need approval from **%@** before they can join this channel";
"Channel.EditAdmin.GuardBotEnable" = "Enable";
"Channel.EditAdmin.GuardBotReplaceTitle" = "Replace Bot";
"Channel.EditAdmin.GuardBotReplaceText" = "**%@** is currently processing join requests. Switch to **%@** instead?";
"Channel.EditAdmin.GuardBotReplaceKeep" = "Keep %@";
"Channel.EditAdmin.GuardBotReplaceUse" = "Use %@";
"Call.RateCall" = "Rate This Call";
"Call.ShareStats" = "Share Statistics";
@ -7020,6 +7029,9 @@ Sorry for the inconvenience.";
"InviteLink.Create.RequestApprovalOffInfoChannel" = "New users will be able to join the channel without being approved by the admins.";
"InviteLink.Create.RequestApprovalOnInfoGroup" = "New users will be able to join the group only after having been approved by the admins.";
"InviteLink.Create.RequestApprovalOnInfoChannel" = "New users will be able to join the channel only after having been approved by the admins.";
"InviteLink.Create.RequestApprovalInfo" = "Request admin approval for people joining through this link.";
"InviteLink.Create.RequestApprovalPublicGroupUnavailable" = "This option is unavailable because anyone can join and send messages through the public group link.";
"InviteLink.ApprovalRequired" = "approval required";
"InviteLink.Create.LinkNameTitle" = "Link Name";
"InviteLink.Create.LinkName" = "Link Name (Optional)";
@ -7606,6 +7618,15 @@ Sorry for the inconvenience.";
"Group.Setup.ApproveNewMembers" = "Approve New Members";
"Group.Setup.ApproveNewMembersInfo" = "Turn this on if you want users to be able to send messages only after they are approved by an admin.";
"Group.Setup.ApproveNewMembersManagedBy" = "Managed by %@";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksTitle" = "Apply to existing invite links?";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksText" = "Also %@ **%@** for **%@ existing invite links** in this %@?";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksEnable" = "enable";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksDisable" = "disable";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksPeerGroup" = "group";
"Group.Setup.ApproveNewMembersApplyToExistingInviteLinksPeerChannel" = "channel";
"Channel.Setup.ApproveNewSubscribers" = "Approve New Subscribers";
"Channel.Setup.ApproveNewSubscribersInfo" = "Turn this on if you want users to be able to join only after they are approved by an admin.";
"Gallery.GifSaved" = "GIF Saved";
@ -16306,3 +16327,15 @@ Error: %8$@";
"VideoChat.StatusPeerJoined" = "%@ joined";
"VideoChat.StatusPeerLeft" = "%@ left";
"ChatList.BotConnectionReview.PanelTitle" = "A bot just got access to your messages!";
"ChatList.BotConnectionReview.PanelText" = "%1$@ connected to your account from %2$@ (%3$@). Was this you?";
"RecentSession.ConnectedBot.Subtitle" = "Chat Automation Bot";
"RecentSession.ConnectedBot.ConnectedFrom" = "CONNECTED FROM";
"RecentSession.ConnectedBot.Date" = "Date";
"RecentSession.ConnectedBot.Device" = "Device";
"RecentSessions.ConnectedBot.ConnectedTime" = "connected %@";
"RecentSessions.ConnectedBot.TerminateCheckbox" = "Also terminate %@";
"Chat.GuestChatMessageTooltip" = "This bot can't read the chat – only the messages where it was mentioned.";