Merge pull request #1109 from ianpartridge/systemlocale

swift-ci · web-flow · commit 8602d9a1ca63 · 2017-07-11T05:16:25.000-07:00
diff --git a/Foundation/NSJSONSerialization.swift b/Foundation/NSJSONSerialization.swift
@@ -533,7 +533,7 @@ private struct JSONWriter {
                 }
                 let options: NSString.CompareOptions = [.numeric, .caseInsensitive, .forcedOrdering]
                 let range: Range<String.Index>  = a.startIndex..<a.endIndex
-                let locale = NSLocale.systemLocale()
+                let locale = NSLocale.system
 
                 return a.compare(b, options: options, range: range, locale: locale) == .orderedAscending
             })
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -84,7 +84,7 @@ extension NSLocale {
         return CFLocaleCopyCurrent()._swiftObject
     }
     
-    open class func systemLocale() -> Locale {
+    open class var system: Locale {
         return CFLocaleGetSystem()._swiftObject
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ private struct JSONWriter {`
`533`	`533`	`}`
`534`	`534`	`let options: NSString.CompareOptions = [.numeric, .caseInsensitive, .forcedOrdering]`
`535`	`535`	`let range: Range<String.Index> = a.startIndex..<a.endIndex`
`536`		`- let locale = NSLocale.systemLocale()`
	`536`	`+ let locale = NSLocale.system`
`537`	`537`
`538`	`538`	`return a.compare(b, options: options, range: range, locale: locale) == .orderedAscending`
`539`	`539`	`})`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ extension NSLocale {`
`84`	`84`	`return CFLocaleCopyCurrent()._swiftObject`
`85`	`85`	`}`
`86`	`86`
`87`		`- open class func systemLocale() -> Locale {`
	`87`	`+ open class var system: Locale {`
`88`	`88`	`return CFLocaleGetSystem()._swiftObject`
`89`	`89`	`}`
`90`	`90`	`}`