Fixed plurals bug for Android. Version 2.54

martinkrasnocka · Jan 16, 2024 · d698424 · d698424
1 parent 84d556c
commit d698424
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/LocsUtil/LocsGenerator.swift b/LocsUtil/LocsGenerator.swift
@@ -17,7 +17,7 @@ class LocsGenerator: NSObject {
     var xlsxReader: XlsxReader
     let langRowIndex = 0 // Language definitions - row index in XSLSX document
     let keyColumnId = "A" // Key definitions - column index in XSLSX document
-    let version = "2.53"
+    let version = "2.54"
 
     override init() {
 //        csvReader = CsvReader()

diff --git a/LocsUtil/PluralsHelper.swift b/LocsUtil/PluralsHelper.swift
@@ -149,16 +149,19 @@ func computePluralsAndroid(pluralKeyValues: [String: String]) -> [Plural] {
             }
         }
 
-
-        plurals.append(Plural(key: pluralKey,
-                              formatString: "",
-                              pluralStringKey: pluralFormatPlaceholder,
-                              zero: allValueStringsForKey[0],
-                              one: allValueStringsForKey[1],
-                              two: allValueStringsForKey[2],
-                              few: allValueStringsForKey[3],
-                              many: allValueStringsForKey[4],
-                              other: allValueStringsForKey[5]))
+        if allValueStringsForKey.count == 6 {
+            plurals.append(Plural(key: pluralKey,
+                                  formatString: "",
+                                  pluralStringKey: pluralFormatPlaceholder,
+                                  zero: allValueStringsForKey[0],
+                                  one: allValueStringsForKey[1],
+                                  two: allValueStringsForKey[2],
+                                  few: allValueStringsForKey[3],
+                                  many: allValueStringsForKey[4],
+                                  other: allValueStringsForKey[5]))
+        } else {
+            print("Skipping plural for \(pluralKey) key")
+        }
 
     }
     return plurals.sorted { pl1, pl2 in

diff --git a/bin/locsutil b/bin/locsutil