Implemented to _SwiftValue.fetch() bridging

aschwaighofer · Mar 13, 2018 · 9336661 · 9336661
1 parent c66a879
commit 9336661
Showing 1 changed file with 7 additions and 38 deletions.
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -99,62 +99,31 @@ extension NSLocale {
     }
 
     open class var availableLocaleIdentifiers: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyAvailableLocaleIdentifiers()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyAvailableLocaleIdentifiers()) as? [String] ?? []
     }
 
     open class var isoLanguageCodes: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyISOLanguageCodes()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyISOLanguageCodes()) as? [String] ?? []
     }
 
     open class var isoCountryCodes: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyISOCountryCodes()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyISOCountryCodes()) as? [String] ?? []
     }
 
     open class var isoCurrencyCodes: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyISOCurrencyCodes()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyISOCurrencyCodes()) as? [String] ?? []
     }
 
     open class var commonISOCurrencyCodes: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyCommonISOCurrencyCodes()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyCommonISOCurrencyCodes()) as? [String] ?? []
     }
 
     open class var preferredLanguages: [String] {
-        var identifiers = Array<String>()
-        for obj in CFLocaleCopyPreferredLanguages()._nsObject {
-            identifiers.append(obj as! String)
-        }
-        return identifiers
+        return _SwiftValue.fetch(CFLocaleCopyPreferredLanguages()) as? [String] ?? []
     }
 
     open class func components(fromLocaleIdentifier string: String) -> [String : String] {
-        var comps = Dictionary<String, String>()
-        let values = CFLocaleCreateComponentsFromLocaleIdentifier(kCFAllocatorSystemDefault, string._cfObject)._nsObject
-        values.enumerateKeysAndObjects(options: []) { (k, v, stop) in
-            let key = (k as! NSString)._swiftObject
-            let value = v as! String
-            comps[key] = value
-        }
-        return comps
+        return _SwiftValue.fetch(CFLocaleCreateComponentsFromLocaleIdentifier(kCFAllocatorSystemDefault, string._cfObject)) as? [String : String] ?? [:] 
     }
 
     open class func localeIdentifier(fromComponents dict: [String : String]) -> String {