ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3ee29b15dd26198961c8344315f637039216ec7b'

Browse Source
This commit is contained in:
Ali 2021-02-19 13:11:44 +04:00
commit 1aa5e4ef78
7 changed files with 2303 additions and 2298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -5867,7 +5867,6 @@ Sorry for the inconvenience.";
"InviteLink.Expired" = "expired";
"InviteLink.UsageLimitReached" = "limit reached";
"InviteLink.Revoked" = "revoked";
"InviteLink.TapToCopy" = "tap to copy";
"InviteLink.AdditionalLinks" = "Additional Links";
"InviteLink.Create" = "Create a New Link";
@ -6058,6 +6057,7 @@ Sorry for the inconvenience.";
"PeerInfo.AutoremoveMessagesDisabled" = "Never";
"Conversation.AutoremoveChanged" = "Auto-Delete timer set to %@";
"Conversation.AutoremoveOff" = "Auto-Delete is now off.";
"PeerInfo.ReportProfilePhoto" = "Report Profile Photo";
"PeerInfo.ReportProfileVideo" = "Report Profile Video";
@ -6144,3 +6144,6 @@ Sorry for the inconvenience.";
"Notification.Exceptions.MessagePreviewAlwaysOn" = "Always On";
"Notification.Exceptions.MessagePreviewAlwaysOff" = "Always Off";
"Channel.Setup.LinkTypePublic" = "Public";
"Channel.Setup.LinkTypePrivate" = "Private";

8
submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
View File

@ -500,9 +500,9 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
case .privateLink:
break
case .initialSetup, .generic:
entries.append(.typeHeader(presentationData.theme, isGroup ? presentationData.strings.Group_Setup_TypeHeader : presentationData.strings.Channel_Edit_LinkItem))
entries.append(.typePublic(presentationData.theme, presentationData.strings.Channel_Setup_TypePublic, selectedType == .publicChannel))
entries.append(.typePrivate(presentationData.theme, presentationData.strings.Channel_Setup_TypePrivate, selectedType == .privateChannel))
entries.append(.typeHeader(presentationData.theme, isGroup ? presentationData.strings.Group_Setup_TypeHeader.uppercased() : presentationData.strings.Channel_Edit_LinkItem.uppercased()))
entries.append(.typePublic(presentationData.theme, isGroup ? presentationData.strings.Channel_Setup_TypePublic : presentationData.strings.Channel_Setup_LinkTypePublic, selectedType == .publicChannel))
entries.append(.typePrivate(presentationData.theme, isGroup ? presentationData.strings.Channel_Setup_TypePrivate : presentationData.strings.Channel_Setup_LinkTypePrivate, selectedType == .privateChannel))
switch selectedType {
case .publicChannel:
@ -653,7 +653,7 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
currentAddressName = ""
}
entries.append(.typeHeader(presentationData.theme, presentationData.strings.Group_Setup_TypeHeader))
entries.append(.typeHeader(presentationData.theme, presentationData.strings.Group_Setup_TypeHeader.uppercased()))
entries.append(.typePublic(presentationData.theme, presentationData.strings.Channel_Setup_TypePublic, selectedType == .publicChannel))
entries.append(.typePrivate(presentationData.theme, presentationData.strings.Channel_Setup_TypePrivate, selectedType == .privateChannel))

4582
submodules/TelegramPresentationData/Sources/PresentationStrings.swift
View File

File diff suppressed because it is too large Load Diff

BIN
submodules/TelegramUI/Resources/PresentationStrings.mapping
View File

Binary file not shown.

2
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -12141,7 +12141,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
text = strongSelf.presentationData.strings.Conversation_AutoremoveChanged("\(timeIntervalString(strings: strongSelf.presentationData.strings, value: myValue))").0
} else {
isOn = false
text = "Auto-Delete is now off."
text = strongSelf.presentationData.strings.Conversation_AutoremoveOff
}
if let text = text {
strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .autoDelete(isOn: isOn, title: nil, text: text), elevatedLayout: false, action: { _ in return false }), in: .current)

2
submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
View File

@ -921,7 +921,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
text = strongSelf.presentationData.strings.Conversation_AutoremoveChanged("\(timeIntervalString(strings: strongSelf.presentationData.strings, value: myValue))").0
} else {
isOn = false
text = "Auto-Delete is now off."
text = strongSelf.presentationData.strings.Conversation_AutoremoveOff
}
if let text = text {
strongSelf.presentController(UndoOverlayController(presentationData: strongSelf.presentationData, content: .autoDelete(isOn: isOn, title: nil, text: text), elevatedLayout: false, action: { _ in return false }), nil)

2
submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
View File

@ -6664,7 +6664,7 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
}
createInviteLinkImpl = { [weak contactsController] in
parentController?.view.endEditing(true)
contactsController?.view.window?.endEditing(true)
contactsController?.present(InviteLinkInviteController(context: context, peerId: groupPeer.id, parentNavigationController: contactsController?.navigationController as? NavigationController), in: .window(.root))
}