Add redundance check

Author: michalsrutek

Example/LocalizeExample/Resources/Languages/en.lproj/Localizable.strings

@@ -1,4 +1,6 @@
 "IgnoredUntranslatedKey" = "OK";
 "MissingKey" = "Hey I'm not present in Spanish!";
 "NeverUsedKey" = "Hey I'm never used so you can just get rid of me!";
-"UntranslatedKey" = "Hey I'm always in english so you need to translate me!";
+"UntranslatedKey" = "Hey I'm always in english so you need to translate me!";
+"DuplicatedKey" = "Hey, I'm here more than once!";
+"DuplicatedKey" = "Hey, I'm here more than once!";

Example/LocalizeExample/Resources/Languages/es.lproj/Localizable.strings

@@ -1,3 +1,5 @@
 "IgnoredUntranslatedKey" = "OK"; //ignore-same-translation-warning
 "NeverUsedKey" = "Hello I'm never used so you can just get rid of me!";
 "UntranslatedKey" = "Hey I'm always in english so you need to translate me!";
+"DuplicatedKey" = "Hey, I'm more than once in the master translations!";
+"RedundantKey" = "Hi, I'm a redundant key only appearing in Spanish";

Example/LocalizeExample/Resources/Languages/fr.lproj/Localizable.strings

@@ -1,4 +1,5 @@
 "IgnoredUntranslatedKey" = "OK"; //ignore-same-translation-warning
-"MissingKey" = "Hey! je n'existe pas en espagnol !";
+"MissingKey" = "Hey! je n'existe pas en espagnol!";
 "NeverUsedKey" = "Bonjour I'm never used so you can just get rid of me!";
-"UntranslatedKey" = "Hey I'm always in english so you need to translate me!";
+"DuplicatedKey" = "Hey, I'm more than once in the master translations!";
+"UntranslatedKey" = "Hey I'm always in english so you need to translate me!";

Example/LocalizeExample/Sources/ViewController.swift

@@ -16,6 +16,7 @@ final class ViewController: UIViewController {
         _ = NSLocalizedString("UntranslatedKey", comment: "")
         _ = NSLocalizedString("IgnoredUntranslatedKey", comment: "")
         _ = NSLocalizedString("MissingKey", comment: "")
+        _ = NSLocalizedString("DuplicatedKey", comment: "")
         _ = NSLocalizedString("MissingKeyFromMain", comment: "This key is not present in master translation file")
     }
 }

Localize.swift

@@ -132,44 +132,49 @@ struct LocalizationFiles {
             sortLinesAlphabetically()
         }
         let location = singleLanguage ? "\(path)/Localizable.strings" : "\(path)/\(name).lproj/Localizable.strings"
-        if let string = try? String(contentsOfFile: location, encoding: .utf8) {
-            let lines = string.components(separatedBy: .newlines)
-            keyValue = [:]
-            let pattern = "\"(.*)\" = \"(.+)\";"
-            let regex = try? NSRegularExpression(pattern: pattern, options: [])
-            var ignoredTranslation: [String] = []
-
-            for (lineNumber, line) in lines.enumerated() {
-                let range = NSRange(location: 0, length: (line as NSString).length)
-
-                // Ignored pattern
-                let ignoredPattern = "\"(.*)\" = \"(.+)\"; *\\/\\/ *ignore-same-translation-warning"
-                let ignoredRegex = try? NSRegularExpression(pattern: ignoredPattern, options: [])
-                if let ignoredMatch = ignoredRegex?.firstMatch(in: line,
-                                                               options: [],
-                                                               range: range) {
-                    let key = (line as NSString).substring(with: ignoredMatch.range(at: 1))
-                    ignoredTranslation.append(key)
-                }
-                if let firstMatch = regex?.firstMatch(in: line, options: [], range: range) {
-                    let key = (line as NSString).substring(with: firstMatch.range(at: 1))
-                    let value = (line as NSString).substring(with: firstMatch.range(at: 2))
-                    if let _ = keyValue[key] {
-                        let str = "\(path)/\(name).lproj"
-                            + "/Localizable.strings:\(linesNumbers[key]!): "
-                            + "error: [Redundance] \"\(key)\" "
-                            + "is redundant in \(name.uppercased()) file"
-                        print(str)
-                        numberOfErrors += 1
-                    } else {
-                        keyValue[key] = value
-                        linesNumbers[key] = lineNumber + 1
-                    }
+        guard let string = try? String(contentsOfFile: location, encoding: .utf8) else {
+            return
+        }
+
+        let lines = string.components(separatedBy: .newlines)
+        keyValue = [:]
+
+        let pattern = "\"(.*)\" = \"(.+)\";"
+        let regex = try? NSRegularExpression(pattern: pattern, options: [])
+        var ignoredTranslation: [String] = []
+
+        for (lineNumber, line) in lines.enumerated() {
+            let range = NSRange(location: 0, length: (line as NSString).length)
+
+            // Ignored pattern
+            let ignoredPattern = "\"(.*)\" = \"(.+)\"; *\\/\\/ *ignore-same-translation-warning"
+            let ignoredRegex = try? NSRegularExpression(pattern: ignoredPattern, options: [])
+            if let ignoredMatch = ignoredRegex?.firstMatch(in: line,
+                                                           options: [],
+                                                           range: range) {
+                let key = (line as NSString).substring(with: ignoredMatch.range(at: 1))
+                ignoredTranslation.append(key)
+            }
+
+            if let firstMatch = regex?.firstMatch(in: line, options: [], range: range) {
+                let key = (line as NSString).substring(with: firstMatch.range(at: 1))
+                let value = (line as NSString).substring(with: firstMatch.range(at: 2))
+
+                if keyValue[key] != nil {
+                    let str = "\(path)/\(name).lproj"
+                        + "/Localizable.strings:\(linesNumbers[key]!): "
+                        + "error: [Duplication] \"\(key)\" "
+                        + "is duplicated in \(name.uppercased()) file"
+                    print(str)
+                    numberOfErrors += 1
+                } else {
+                    keyValue[key] = value
+                    linesNumbers[key] = lineNumber + 1
                 }
             }
-            print(ignoredFromSameTranslation)
-            ignoredFromSameTranslation[name] = ignoredTranslation
         }
+        print(ignoredFromSameTranslation)
+        ignoredFromSameTranslation[name] = ignoredTranslation
     }
 
     func rebuildFileString(from lines: [String]) -> String {
@@ -306,6 +311,15 @@ for file in localizationFiles {
             numberOfErrors += 1
         }
     }
+
+    let redundantKeys = file.keyValue.keys.filter { !masterLocalizationFile.keyValue.keys.contains($0) }
+
+    for k in redundantKeys {
+        let str = "\(path)/\(file.name).lproj/Localizable.strings:\(file.linesNumbers[k]!): "
+            + "error: [Redundant key] \"\(k)\" redundant in \(file.name.uppercased()) file"
+
+        print(str)
+    }
 }
 
 if checkForUntranslated {