Dont use bundle in NSLocalizedString for android

Author: Anton Pogonets

Foundation/NSString.swift

@@ -21,18 +21,22 @@ extension unichar : ExpressibleByUnicodeScalarLiteral {
 }
 
 /// Returns a localized string, using the main bundle if one is not specified.
-public
-func NSLocalizedString(_ key: String,
-                       tableName: String? = nil,
-                       bundle: Bundle = Bundle.main,
-                       value: String = "",
-                       comment: String) -> String {
-    #if os(Android)
-        return key
-    #else
-        return bundle.localizedString(forKey: key, value: value, table: tableName)
-    #endif
+#if os(Android)
+public func NSLocalizedString(_ key: String,
+                              tableName: String? = nil,
+                              value: String = "",
+                              comment: String) -> String {
+    return key
 }
+#else
+public func NSLocalizedString(_ key: String,
+                              tableName: String? = nil,
+                              bundle: Bundle = Bundle.main,
+                              value: String = "",
+                              comment: String) -> String {
+    return bundle.localizedString(forKey: key, value: value, table: tableName)
+}
+#endif
 
 #if os(OSX) || os(iOS)
 internal let kCFStringEncodingMacRoman =  CFStringBuiltInEncodings.macRoman.rawValue

Foundation/URLSession/http/HTTPURLProtocol.swift

@@ -197,7 +197,7 @@ fileprivate extension _HTTPURLProtocol {
             self?.completeTask(withError: urlError)
             self?.client?.urlProtocol(self!, didFailWithError: urlError)
         }
-	guard let task = self.task else { fatalError() }
+        guard let task = self.task else { fatalError() }
         easyHandle.timeoutTimer = _TimeoutSource(queue: task.workQueue, milliseconds: timeoutInterval, handler: timeoutHandler)
 
         easyHandle.set(automaticBodyDecompression: true)
@@ -344,7 +344,7 @@ internal extension _HTTPURLProtocol {
                 NSURLErrorFailingURLErrorKey: $0,
                 NSURLErrorFailingURLStringErrorKey: $0.absoluteString,
                 NSLocalizedDescriptionKey: error.localizedDescription
-                ]
+            ]
         }
         let urlError = URLError(_nsError: NSError(domain: NSURLErrorDomain, code: error.code, userInfo: userInfo))
         completeTask(withError: urlError)