Fix merge bugs in ComposableCoreLocation.

Author: mluisbrown

Sources/ComposableArchitecture/Internal/LocalizedStringKey.swift

@@ -21,7 +21,7 @@ extension LocalizedStringKey: CustomDebugOutputConvertible {
         return formatter?.string(for: value) ?? value as! CVarArg
       }
 
-    return String(format: key, locale: nil, arguments: arguments)
+    return String(format: key, locale: locale, arguments: arguments)
   }
 
   public var debugOutput: String {

Sources/ComposableCoreLocation/Models/Location.swift

@@ -45,12 +45,6 @@ extension Location: Hashable {
       if #available(iOS 13.4, macCatalyst 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, *) {
         courseAccuracyIsEqual = lhs.courseAccuracy == rhs.courseAccuracy
         speedAccuracyIsEqual = lhs.speedAccuracy == rhs.speedAccuracy
-      } else {
-        courseAccuracyIsEqual = true
-        speedAccuracyIsEqual = true
-      }
-      if #available(OSX 10.15, *) {
-        speedAccuracyIsEqual = lhs.speedAccuracy == rhs.speedAccuracy
         floorEqual = lhs.floor == rhs.floor
       } else {
         courseAccuracyIsEqual = true
@@ -80,14 +74,14 @@ extension Location: Hashable {
     hasher.combine(self.coordinate.latitude)
     hasher.combine(self.coordinate.longitude)
     hasher.combine(self.course)
-    hasher.combine(self.floor)
     hasher.combine(self.horizontalAccuracy)
     hasher.combine(self.speed)
     hasher.combine(self.timestamp)
     hasher.combine(self.verticalAccuracy)
 
     #if compiler(>=5.2)
     if #available(iOS 13.4, macCatalyst 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, *) {
+      hasher.combine(self.floor)
       hasher.combine(self.speedAccuracy)
       hasher.combine(self.courseAccuracy)
     }