fix: prioritize plural localization over simple strings in LocalLocalizationExtractor and LocalizationProvider

Author: serhii-londar

Sources/CrowdinSDK/CrowdinSDK/Localization/Extractor/LocalLocalizationExtractor.swift

@@ -111,14 +111,18 @@ final class LocalLocalizationExtractor {
 
     // Localization methods
     func localizedString(for key: String) -> String? {
-        var string = self.localizationDict[key]
+        // Check plurals first - if a key has plurals defined, those take precedence over simple strings
+        // This fixes the issue where keys exist in both .strings and .stringsdict files
+        var string = self.pluralsBundle?.bundle?.swizzled_LocalizedString(forKey: key, value: nil, table: nil)
+        // Plurals localization works as default bundle localization. In case localized string for key is missing the key string will be returned.
+        // To prevent issues with localization where key equals value(for example for english language) we need to set nil here.
+        if string == key {
+            string = nil
+        }
+        
+        // If no plural exists, fall back to simple strings
         if string == nil {
-            string = self.pluralsBundle?.bundle?.swizzled_LocalizedString(forKey: key, value: nil, table: nil)
-            // Plurals localization works as default bundle localization. In case localized string for key is missing the key string will be returned.
-            // To prevent issues with localization where key equals value(for example for english language) we need to set nil here.
-            if string == key {
-                string = nil
-            }
+            string = self.localizationDict[key]
         }
         return string
     }

Sources/CrowdinSDK/CrowdinSDK/Localization/Provider/LocalizationProvider.swift

@@ -168,15 +168,19 @@ class LocalizationProvider: NSObject, LocalizationProviderProtocol {
 
     // Localization methods
     func localizedString(for key: String) -> String? {
-        var string = self.strings[key]
+        // Check plurals first - if a key has plurals defined, those take precedence over simple strings
+        // This fixes the issue where keys exist in both .strings and .stringsdict files
+        var string = self.pluralsBundle?.bundle?.swizzled_LocalizedString(forKey: key, value: nil, table: nil)
+        // Plurals localization works as default bundle localization.
+        // In case localized string for key is missing the key string will be returned.
+        // To prevent issues with localization where key equals value(for example for english language) we need to set nil here.
+        if string == key {
+            string = nil
+        }
+        
+        // If no plural exists, fall back to simple strings
         if string == nil {
-			string = self.pluralsBundle?.bundle?.swizzled_LocalizedString(forKey: key, value: nil, table: nil)
-            // Plurals localization works as default bundle localization.
-            // In case localized string for key is missing the key string will be returned.
-            // To prevent issues with localization where key equals value(for example for english language) we need to set nil here.
-            if string == key {
-                string = nil
-            }
+            string = self.strings[key]
         }
         return string
     }

Tests/Tests/en.lproj/Localizable.strings

@@ -10,3 +10,7 @@
 "test_key_with_string_parameter" = "test value with parameter - %@ [B]"; // B - buldle
 "test_key_with_int_parameter" = "test value with parameter - %lu [B]"; // B - buldle
 "test_key_with_two_parameters" = "test value with parameter - %@, and parameter - %@ [B]"; // B - buldle
+
+// Plural key that also exists in Localizable.stringsdict - this simulates what Crowdin exports
+// The plural forms in .stringsdict should take precedence over this simple string
+"johns_pineapples_count" = "John has pineapples"; // Fallback singular form

Tests/UnitTests/BundleStringTests.swift

@@ -21,5 +21,29 @@ class BundleStringTests: XCTestCase {
         XCTAssert("test_key_with_string_parameter".cw_localized(with: ["value"]) == "test value with parameter - value [B]")
         XCTAssert("test_key_with_int_parameter".cw_localized(with: [1]) == "test value with parameter - 1 [B]")
     }
+    
+    func testPluralLocalizationWithKeyInBothFiles() {
+        // Test for issue #347: When a key exists in both .strings and .stringsdict files,
+        // plural forms should take precedence over the simple string
+        
+        // The key "johns_pineapples_count" exists in both:
+        // - Localizable.strings: "John has pineapples" (simple fallback string)
+        // - Localizable.stringsdict: proper plural definitions (zero/one/other)
+        
+        // Format for zero (should use plural from stringsdict, not simple string)
+        let formatZero = NSLocalizedString("johns_pineapples_count", comment: "")
+        let stringZero = String.localizedStringWithFormat(formatZero, 0)
+        XCTAssert(stringZero == "John has no pineapples", "Zero plural form should work: '\(stringZero)'")
+        
+        // Format for one (should use plural from stringsdict)
+        let formatOne = NSLocalizedString("johns_pineapples_count", comment: "")
+        let stringOne = String.localizedStringWithFormat(formatOne, 1)
+        XCTAssert(stringOne == "John has 1 pineapple", "Singular plural form should work: '\(stringOne)'")
+        
+        // Format for multiple (should use plural from stringsdict)
+        let formatMany = NSLocalizedString("johns_pineapples_count", comment: "")
+        let stringMany = String.localizedStringWithFormat(formatMany, 5)
+        XCTAssert(stringMany == "John has 5 pineapples", "Plural form should work: '\(stringMany)'")
+    }
 }