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

Update submodules

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-02-09 00:07:08 +04:00
parent d88f0bcbe8
commit e3f5688b82
4 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram-iOS/LegacyPreferencesImport.swift
View File

@ -253,7 +253,8 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA
var settings: AutomaticMediaDownloadSettings = current as? AutomaticMediaDownloadSettings ?? .defaultSettings
if let preferences = autoDownloadPreferences, !preferences.isDefaultPreferences() {
settings.masterEnabled = !preferences.disabled
settings.cellularEnabled = !preferences.disabled
settings.wifiEnabled = !preferences.disabled
let peerPaths: [(WritableKeyPath<AutomaticMediaDownloadPeers, AutomaticMediaDownloadCategories>, TGAutoDownloadMode, TGAutoDownloadMode)] = [
(\AutomaticMediaDownloadPeers.contacts, TGAutoDownloadModeCellularContacts, TGAutoDownloadModeWifiContacts),
@ -273,7 +274,7 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA
for (categoryPath, category, maxSize) in categoryPaths {
for (peerPath, cellular, wifi) in peerPaths {
let targetPath = peerPath.appending(path: categoryPath)
settings.peers[keyPath: targetPath] = AutomaticMediaDownloadCategory(cellular: (category.rawValue & cellular.rawValue) != 0, wifi: (category.rawValue & wifi.rawValue) != 0, sizeLimit: maxSize)
settings.peers[keyPath: targetPath] = AutomaticMediaDownloadCategory(cellular: (category.rawValue & cellular.rawValue) != 0, cellularSizeLimit: maxSize, wifi: (category.rawValue & wifi.rawValue) != 0, wifiSizeLimit: maxSize)
}
}
}

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

@ -2997,7 +2997,7 @@ Unused sets are archived when you add more.";
"Privacy.Calls.P2PContacts" = "My Contacts";
"Privacy.Calls.P2PAlways" = "Always";
"ChatSettings.AutoDownloadTitle" = "AUTOMATIC MEDIA DOWNLOAD";
"ChatSettings.AutoDownloadTitle" = "AUTO-DOWNLOAD MEDIA";
"ChatSettings.AutoDownloadEnabled" = "Auto-Download Media";
"ChatSettings.AutoDownloadPhotos" = "Photos";
"ChatSettings.AutoDownloadVideos" = "Videos";
@ -3972,6 +3972,50 @@ Unused sets are archived when you add more.";
"SocksProxySetup.Status" = "Status";
"Login.PhoneNumberAlreadyAuthorized" = "This account is already logged in from this app.";
"Login.PhoneNumberAlreadyAuthorizedSwitch" = "Switch";
"Call.AnsweringWithAccount" = "Answering as %@";
"AutoDownloadSettings.CellularTitle" = "Using Cellular";
"AutoDownloadSettings.WifiTitle" = "Using Wi-Fi";
"AutoDownloadSettings.AutoDownload" = "Auto-Download Media";
"AutoDownloadSettings.MediaTypes" = "TYPES OF MEDIA";
"AutoDownloadSettings.Photos" = "Photos";
"AutoDownloadSettings.Videos" = "Videos";
"AutoDownloadSettings.Files" = "Files";
"AutoDownloadSettings.VideoMessages" = "Video Messages";
"AutoDownloadSettings.VoiceMessages" = "Voice Messages";
"AutoDownloadSettings.MediaTypesInfo" = "You can customize each of the media types and set individual size limits.";
"AutoDownloadSettings.Save" = "Save";
"AutoDownloadSettings.ResetSettings" = "Reset Auto-Download Settings";
"AutoDownloadSettings.Limit" = "Limit by Size";
"AutoDownloadSettings.OnForAll" = "ON for all chats";
"AutoDownloadSettings.OnFor" = "ON for %@";
"AutoDownloadSettings.TypeContacts" = "Contacts";
"AutoDownloadSettings.TypePrivateChats" = "Private chats";
"AutoDownloadSettings.TypeGroupChats" = "Group chats";
"AutoDownloadSettings.TypeChannels" = "Channels";
"AutoDownloadSettings.UpToForAll" = "Up to %@ in all chats";
"AutoDownloadSettings.UpToFor" = "Up to %@ in %@";
"AutoDownloadSettings.OffForAll" = "OFF for all chats";
"AutoDownloadSettings.Delimeter" = ", ";
"AutoDownloadSettings.LastDelimeter" = " and ";
"ChatSettings.AutoDownloadUsingCellular" = "Using Cellular";
"ChatSettings.AutoDownloadUsingWiFi" = "Using Wi-Fi";
"ChatSettings.AutoPlayTitle" = "AUTO-PLAY MEDIA";
"ChatSettings.AutoPlayGifs" = "GIFs";
"ChatSettings.AutoPlayVideos" = "Videos";
"ChatSettings.AutoDownloadSettings.OnForAll" = "ON for all media";
"ChatSettings.AutoDownloadSettings.OnFor" = "ON for %@";
"ChatSettings.AutoDownloadSettings.TypePhoto" = "photos";
"ChatSettings.AutoDownloadSettings.TypeVideo" = "videos";
"ChatSettings.AutoDownloadSettings.TypeFile" = "files";
"ChatSettings.AutoDownloadSettings.TypeVideoMessage" = "video messages";
"ChatSettings.AutoDownloadSettings.TypeVoiceMessage" = "voice messages";
"ChatSettings.AutoDownloadSettings.OffForAll" = "OFF for all media";
"ChatSettings.AutoDownloadSettings.Delimeter" = ", ";
"ChatSettings.AutoDownloadSettings.LastDelimeter" = " and ";

2
submodules/Display

@ -1 +1 @@
Subproject commit e065d5af3fdf9c7d9eeed508411a0ddebfad1406
Subproject commit 519b16d4cf58bca8a50b177197ebb0ddec23120f

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 9d9d0332d444452bd006a1933066727c0b540870
Subproject commit 9a35187cec3199e6ae331b5d998d64dcf57fb302