Skip to content

Commit 84365da

Browse files
committed
Added language ID to locale.
1 parent e5935c8 commit 84365da

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

Diff for: Sources/SwiftBoost/Foundation/Extensions/LocaleExtension.swift

+10-17
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,17 @@ public extension Locale {
1111
return dateString.contains(dateFormatter.amSymbol) || dateString.contains(dateFormatter.pmSymbol)
1212
}
1313

14-
func localised(in locale: Locale) -> String? {
15-
16-
func supportedLangCodeId(for locale: Locale) -> String? {
17-
if #available(iOS 16.0, macOS 13.0, *) {
18-
return locale.language.languageCode?.identifier
19-
} else {
20-
return locale.languageCode
21-
}
14+
var languageID: String? {
15+
if #available(iOS 16.0, macOS 13.0, *) {
16+
return self.language.languageCode?.identifier
17+
} else {
18+
return self.languageCode
2219
}
23-
24-
guard let currentLanguageCode = {
25-
supportedLangCodeId(for: self)
26-
}() else { return nil }
27-
28-
guard let toLanguageCode = {
29-
supportedLangCodeId(for: locale)
30-
}() else { return nil }
31-
20+
}
21+
22+
func localised(in locale: Locale) -> String? {
23+
guard let currentLanguageCode = self.languageID else { return nil }
24+
guard let toLanguageCode = locale.languageID else { return nil }
3225
let nslocale = NSLocale(localeIdentifier: toLanguageCode)
3326
let text = nslocale.displayName(forKey: NSLocale.Key.identifier, value: currentLanguageCode)
3427
return text?.localizedCapitalized

0 commit comments

Comments
 (0)