commit 4aa4dac2a3472bde158be45fc6b07c05f6b70e0a
author swift-ci <swift-ci@users.noreply.github.com> Thu Jun 01 04:32:09 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Thu Jun 01 04:32:09 2017 -0700
tree f93c0adb7c65f91d0891e862f1ce1dd420fdd8e9
parent cb7be957d936cfe4cef4b223723cd5da25594128
parent 28fe0323ec35b6b1d47adba5a1613ef54c2af368

Merge remote-tracking branch 'origin/master' into swift-4.0-branch

Foundation/NSLocale.swift

diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
index 8cefe1d..266f377 100644
--- a/Foundation/NSLocale.swift
+++ b/Foundation/NSLocale.swift
@@ -28,7 +28,7 @@
     }
     
     open func object(forKey key: NSLocale.Key) -> Any? {
-        return CFLocaleGetValue(_cfObject, key.rawValue._cfObject)
+        return _SwiftValue.fetch(CFLocaleGetValue(_cfObject, key.rawValue._cfObject))
     }
     
     open func displayName(forKey key: Key, value: String) -> String? {
@@ -91,7 +91,7 @@
 
 extension NSLocale {
     public var localeIdentifier: String {
-        return (object(forKey: .identifier) as! NSString)._swiftObject
+        return object(forKey: .identifier) as! String
     }
     
     open class var availableLocaleIdentifiers: [String] {

TestFoundation/TestNSLocale.swift

diff --git a/TestFoundation/TestNSLocale.swift b/TestFoundation/TestNSLocale.swift
index bfd69ad..02a22cd 100644
--- a/TestFoundation/TestNSLocale.swift
+++ b/TestFoundation/TestNSLocale.swift
@@ -22,6 +22,7 @@
             ("test_Identifier", test_Identifier),
             ("test_copy", test_copy),
             ("test_availableIdentifiers", test_availableIdentifiers),
+            ("test_localeProperties", test_localeProperties),
         ]
     }
 
@@ -112,4 +113,14 @@
      func test_availableIdentifiers() {
         XCTAssertNoThrow(Locale.availableIdentifiers)
     }
+ 
+    func test_localeProperties(){
+        let enUSID = "en_US"
+        let locale = Locale(identifier: enUSID)
+        XCTAssertEqual(String(describing: locale.languageCode!), "en")
+        XCTAssertEqual(String(describing: locale.decimalSeparator!), ".")
+        XCTAssertEqual(String(describing: locale.currencyCode!), "USD")
+        XCTAssertEqual(String(describing: locale.collatorIdentifier!), enUSID)
+    }
+
 }