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

Merge branch 'master' of github.com:peter-iakovlev/TelegramUI

Browse Source 
# Conflicts:
#	TelegramUI/PresentationStrings.swift
#	TelegramUI/Resources/PresentationStrings.mapping
This commit is contained in:
Ilya Laktyushin
2018-11-12 01:29:53 +04:00
parent bd96489d15 5266955059
commit 84c0819a2a
27 changed files with 2460 additions and 2210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TelegramUI/ChatListController.swift
View File

@@ -556,7 +556,13 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie
let signal = self.account.postbox.transaction { transaction -> (String, SuggestedLocalizationEntry?) in
let languageCode: String
if let current = transaction.getPreferencesEntry(key: PreferencesKeys.localizationSettings) as? LocalizationSettings {
languageCode = current.primaryComponent.languageCode
let code = current.primaryComponent.languageCode
let rawSuffix = "-raw"
if code.hasSuffix(rawSuffix) {
languageCode = String(code.dropLast(rawSuffix.count))
} else {
languageCode = code
}
} else {
languageCode = "en"
}
@@ -581,12 +587,12 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie
}
if let controller = languageSuggestionController(account: strongSelf.account, suggestedLocalization: suggestedLocalization, currentLanguageCode: currentLanguageCode, openSelection: { [weak self] in
if let strongSelf = self {
let controller = LanguageSelectionController(account: strongSelf.account)
(strongSelf.navigationController as? NavigationController)?.replaceAllButRootController(controller, animated: true)
let controller = LocalizationListController(account: strongSelf.account)
(strongSelf.navigationController as? NavigationController)?.pushViewController(controller)
}
}) {
strongSelf.present(controller, in: .window(.root))
_ = markSuggestedLocalizationAsSeenInteractively(postbox: strongSelf.account.postbox, languageCode: suggestedLocalization.languageCode).start()
//_ = markSuggestedLocalizationAsSeenInteractively(postbox: strongSelf.account.postbox, languageCode: suggestedLocalization.languageCode).start()
}
}))
}