Merge pull request #18 from ranunez/feature/comparable

Cleans up sorting

Author: igorkulman

LocalizationEditor/Models/Localization.swift

@@ -29,7 +29,7 @@ class Localization {
         }
 
         let newTranslation = LocalizationString(key: key, value: value)
-        translations = (translations + [newTranslation]).sorted(by: { $0.key < $1.key })
+        translations = (translations + [newTranslation]).sorted()
     }
 }
 
@@ -40,3 +40,9 @@ extension Localization: CustomStringConvertible {
         return language.uppercased()
     }
 }
+
+extension Localization: Equatable {
+    static func == (lhs: Localization, rhs: Localization) -> Bool {
+        return lhs.language == rhs.language && lhs.translations == rhs.translations && lhs.path == rhs.path
+    }
+}

LocalizationEditor/Models/LocalizationGroup.swift

@@ -30,3 +30,13 @@ extension LocalizationGroup: CustomStringConvertible {
         return name
     }
 }
+
+extension LocalizationGroup: Comparable {
+    static func < (lhs: LocalizationGroup, rhs: LocalizationGroup) -> Bool {
+        return lhs.name < rhs.name
+    }
+
+    static func == (lhs: LocalizationGroup, rhs: LocalizationGroup) -> Bool {
+        return lhs.name == rhs.name && lhs.path == rhs.path && lhs.localizations == rhs.localizations
+    }
+}

LocalizationEditor/Models/LocalizationString.swift

@@ -32,3 +32,13 @@ extension LocalizationString: CustomStringConvertible {
         return "\(key) = \(value)"
     }
 }
+
+extension LocalizationString: Comparable {
+    static func < (lhs: LocalizationString, rhs: LocalizationString) -> Bool {
+        return lhs.key < rhs.key
+    }
+
+    static func == (lhs: LocalizationString, rhs: LocalizationString) -> Bool {
+        return lhs.key == rhs.key && lhs.value == rhs.value
+    }
+}

LocalizationEditor/Providers/LocalizationProvider.swift

@@ -78,7 +78,7 @@ final class LocalizationProvider {
                 let lang = String(parts[parts.count - 2]).replacingOccurrences(of: ".lproj", with: "")
                 return Localization(language: lang, translations: getLocalizationStrings(path: file.path), path: file.path)
             }), path: path)
-        }).sorted(by: { $0.name < $1.name })
+        }).sorted()
     }
 
     // MARK: Internal implementation
@@ -99,8 +99,6 @@ final class LocalizationProvider {
 
         Log.debug?.message("Found \(localizationStrings.count) keys for in \(path)")
 
-        return localizationStrings.sorted(by: { lhs, rhs -> Bool in
-            lhs.key < rhs.key
-        })
+        return localizationStrings.sorted()
     }
 }