ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +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-11 22:27:51 +04:00
parent cc17271034 afc2b464b1
commit bd96489d15
44 changed files with 4690 additions and 2408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TelegramUI/AuthorizationSequenceSplashController.swift
View File

@@ -181,7 +181,7 @@ final class AuthorizationSequenceSplashController: ViewController {
}
let stringsValue: PresentationStrings
if let localizationSettings = localizationSettings {
stringsValue = PresentationStrings(primaryComponent: PresentationStringsComponent(languageCode: localizationSettings.primaryComponent.languageCode, pluralizationRulesCode: localizationSettings.primaryComponent.customPluralizationCode, dict: dictFromLocalization(localizationSettings.primaryComponent.localization)), secondaryComponent: localizationSettings.secondaryComponent.flatMap({ PresentationStringsComponent(languageCode: $0.languageCode, pluralizationRulesCode: $0.customPluralizationCode, dict: dictFromLocalization($0.localization)) }))
stringsValue = PresentationStrings(primaryComponent: PresentationStringsComponent(languageCode: localizationSettings.primaryComponent.languageCode, localizedName: localizationSettings.primaryComponent.localizedName, pluralizationRulesCode: localizationSettings.primaryComponent.customPluralizationCode, dict: dictFromLocalization(localizationSettings.primaryComponent.localization)), secondaryComponent: localizationSettings.secondaryComponent.flatMap({ PresentationStringsComponent(languageCode: $0.languageCode, localizedName: $0.localizedName, pluralizationRulesCode: $0.customPluralizationCode, dict: dictFromLocalization($0.localization)) }))
} else {
stringsValue = defaultPresentationStrings
}