zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Fix more warnings

This commit is contained in:
Nathan Mattes 2023-11-05 21:31:12 +01:00
parent 0c3313227b
commit 32e656f342
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift
View File

@ -150,7 +150,7 @@ extension MastodonRegisterViewController {
return "en" return "en"
} }
let fallbackLanguageCode: String = { let fallbackLanguageCode: String = {
let code = Locale.current.languageCode ?? "en" let code = Locale.current.language.languageCode?.identifier ?? "en"
guard localCode[code] != nil else { return "en" } guard localCode[code] != nil else { return "en" }
return code return code
}() }()
@ -161,7 +161,7 @@ extension MastodonRegisterViewController {
} }
// prepare languageCode and validate then return fallback if needs // prepare languageCode and validate then return fallback if needs
let local = Locale(identifier: identifier) let local = Locale(identifier: identifier)
guard let languageCode = local.languageCode, guard let languageCode = local.language.languageCode?.identifier,
localCode[languageCode] != nil localCode[languageCode] != nil
else { else {
return fallbackLanguageCode return fallbackLanguageCode
@ -170,10 +170,10 @@ extension MastodonRegisterViewController {
let extendCodes: [String] = { let extendCodes: [String] = {
let locales = Locale.preferredLanguages.map { Locale(identifier: $0) } let locales = Locale.preferredLanguages.map { Locale(identifier: $0) }
return locales.compactMap { locale in return locales.compactMap { locale in
guard let languageCode = locale.languageCode, guard let languageCode = locale.language.languageCode?.identifier,
let regionCode = locale.regionCode let regionIdentifier = locale.region?.identifier
else { return nil } else { return nil }
return languageCode + "-" + regionCode return languageCode + "-" + regionIdentifier
} }
}() }()
let _firstMatchExtendCode = extendCodes.first { code in let _firstMatchExtendCode = extendCodes.first { code in