Merge pull request swiftlang#1474 from pvieito/locale-briding-fix

aschwaighofer · Apr 3, 2018 · 161ab81 · 161ab81
2 parents c76e152 + 9336661
commit 161ab81
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 44 deletions.
diff --git a/CoreFoundation/Locale.subproj/CFLocale.c b/CoreFoundation/Locale.subproj/CFLocale.c
@@ -1080,7 +1080,7 @@ _CFLocaleCalendarDirection _CFLocaleGetCalendarDirection(void) {
 #endif
 }
 
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
 static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesArray) {
     CFMutableArrayRef newArray = CFArrayCreateMutable(kCFAllocatorSystemDefault, 0, &kCFTypeArrayCallBacks);
     if (languagesArray && (CFArrayGetTypeID() == CFGetTypeID(languagesArray))) {
@@ -1100,7 +1100,7 @@ static CFArrayRef _CFLocaleCopyPreferredLanguagesFromPrefs(CFArrayRef languagesA
 #endif
 
 CFArrayRef CFLocaleCopyPreferredLanguages(void) {
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
     CFArrayRef languagesArray = (CFArrayRef)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication);
     CFArrayRef result = _CFLocaleCopyPreferredLanguagesFromPrefs(languagesArray);
     if (languagesArray) CFRelease(languagesArray);

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! NSString)._swiftObject)
-        }
-        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! NSString)._swiftObject)
-        }
-        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! NSString)._swiftObject)
-        }
-        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! NSString)._swiftObject)
-        }
-        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! NSString)._swiftObject)
-        }
-        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! NSString)._swiftObject
-            comps[key] = value
-        }
-        return comps
+        return _SwiftValue.fetch(CFLocaleCreateComponentsFromLocaleIdentifier(kCFAllocatorSystemDefault, string._cfObject)) as? [String : String] ?? [:] 
     }
 
     open class func localeIdentifier(fromComponents dict: [String : String]) -> String {

diff --git a/TestFoundation/TestNSLocale.swift b/TestFoundation/TestNSLocale.swift
@@ -21,7 +21,7 @@ class TestNSLocale : XCTestCase {
             ("test_constants", test_constants),
             ("test_Identifier", test_Identifier),
             ("test_copy", test_copy),
-            ("test_availableIdentifiers", test_availableIdentifiers),
+            ("test_staticProperties", test_staticProperties),
             ("test_localeProperties", test_localeProperties),
         ]
     }
@@ -110,10 +110,29 @@ class TestNSLocale : XCTestCase {
         XCTAssertTrue(locale == localeCopy)
     }
 
-     func test_availableIdentifiers() {
-        XCTAssertNoThrow(Locale.availableIdentifiers)
+    func test_staticProperties() {
+        let euroCurrencyCode = "EUR"
+        let spainRegionCode = "ES"
+        let galicianLanguageCode = "gl"
+        let galicianLocaleIdentifier = Locale.identifier(fromComponents: [NSLocale.Key.languageCode.rawValue: galicianLanguageCode,
+                                                                          NSLocale.Key.countryCode.rawValue: spainRegionCode])
+
+        XCTAssertTrue(galicianLocaleIdentifier == "\(galicianLanguageCode)_\(spainRegionCode)")
+
+        let components = Locale.components(fromIdentifier: galicianLocaleIdentifier)
+
+        XCTAssertTrue(components[NSLocale.Key.languageCode.rawValue] == galicianLanguageCode)
+        XCTAssertTrue(components[NSLocale.Key.countryCode.rawValue] == spainRegionCode)
+
+        XCTAssertTrue(Locale.availableIdentifiers.contains(galicianLocaleIdentifier))
+        XCTAssertTrue(Locale.commonISOCurrencyCodes.contains(euroCurrencyCode))
+        XCTAssertTrue(Locale.isoCurrencyCodes.contains(euroCurrencyCode))
+        XCTAssertTrue(Locale.isoRegionCodes.contains(spainRegionCode))
+        XCTAssertTrue(Locale.isoLanguageCodes.contains(galicianLanguageCode))
+
+        XCTAssertTrue(Locale.preferredLanguages.count == UserDefaults.standard.array(forKey: "AppleLanguages")?.count ?? 0)
     }
-
+    
     func test_localeProperties(){
 #if os(Android)
         XCTFail("Locale lookup unavailable on Android")