fix: keep zero plural form in Apple XLIFF export

munzzyy · munzzyy · commit abc0cd50302f · 2026-08-10T12:02:10.000-05:00
Apple XLIFF export dropped any plural form that CLDR doesn't define for the target locale, so an authored zero case (e.g. English zero/one/other) never made it into the exported stringsdict/xcstrings. AppleXliffExporter now keeps every form the user actually wrote in addition to the locale's CLDR forms, matching what the xcstrings exporter already does. Fixes #3074
diff --git a/backend/data/src/main/kotlin/io/tolgee/formats/apple/out/AppleXliffExporter.kt b/backend/data/src/main/kotlin/io/tolgee/formats/apple/out/AppleXliffExporter.kt
@@ -5,6 +5,7 @@ import io.tolgee.formats.PossiblePluralConversionResult
 import io.tolgee.formats.apple.APPLE_CORRESPONDING_STRINGS_FILE_ORIGINAL
 import io.tolgee.formats.apple.APPLE_FILE_ORIGINAL_CUSTOM_KEY
 import io.tolgee.formats.apple.APPLE_PLURAL_PROPERTY_CUSTOM_KEY
+import io.tolgee.formats.getPluralFormsForLocale
 import io.tolgee.formats.xliff.model.XliffFile
 import io.tolgee.formats.xliff.model.XliffModel
 import io.tolgee.formats.xliff.model.XliffTransUnit
@@ -231,10 +232,13 @@ class AppleXliffExporter(
     languageTag: String,
     conversionResult: PossiblePluralConversionResult?,
   ): Map<String, String> {
-    if (conversionResult?.formsResult == null) {
-      return emptyMap()
-    }
-    return io.tolgee.formats.populateForms(languageTag, conversionResult.formsResult)
+    val forms = conversionResult?.formsResult ?: return emptyMap()
+    // Apple's plural formats (stringsdict/xcstrings) accept any form the user actually wrote
+    // (e.g. "zero"), not just the forms CLDR defines for the target locale, so we keep every
+    // authored form in addition to filling in the ones CLDR expects (e.g. "many" for cs).
+    val otherForm = forms["other"] ?: ""
+    val allForms = getPluralFormsForLocale(languageTag) + forms.keys
+    return allForms.associateWith { forms[it] ?: otherForm }
   }
 
   private fun getResultXliffFile(
diff --git a/backend/data/src/test/kotlin/io/tolgee/unit/formats/apple/out/AppleXliffFileExporterTest.kt b/backend/data/src/test/kotlin/io/tolgee/unit/formats/apple/out/AppleXliffFileExporterTest.kt
@@ -308,6 +308,51 @@ class AppleXliffFileExporterTest {
     )
   }
 
+  @Test
+  fun `keeps a zero plural form that is not in the target locale's CLDR forms`() {
+    val built =
+      buildExportTranslationList {
+        add(
+          languageTag = "en",
+          keyName = "attendee_count",
+          text = "{count, plural, zero {No participants} one {1 Participant} other {Many participants}}",
+        ) {
+          key.isPlural = true
+          key.custom = mapOf(APPLE_FILE_ORIGINAL_CUSTOM_KEY to "Localizable.xcstrings")
+        }
+      }
+    val exporter = getExporter(built.translations, emptyList())
+    val data = getExported(exporter)
+    data.assertFile(
+      "en.xliff",
+      """
+    |<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    |<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    |  <file datatype="plaintext" original="Localizable.xcstrings" source-language="tag" target-language="en">
+    |    <header>
+    |      <tool tool-id="tolgee.io" tool-name="Tolgee"/>
+    |    </header>
+    |    <body>
+    |      <trans-unit id="attendee_count|==|plural.one">
+    |        <source xml:space="preserve"/>
+    |        <target xml:space="preserve">1 Participant</target>
+    |      </trans-unit>
+    |      <trans-unit id="attendee_count|==|plural.other">
+    |        <source xml:space="preserve"/>
+    |        <target xml:space="preserve">Many participants</target>
+    |      </trans-unit>
+    |      <trans-unit id="attendee_count|==|plural.zero">
+    |        <source xml:space="preserve"/>
+    |        <target xml:space="preserve">No participants</target>
+    |      </trans-unit>
+    |    </body>
+    |  </file>
+    |</xliff>
+    |
+      """.trimMargin(),
+    )
+  }
+
   @Test
   fun `honors the provided fileStructureTemplate`() {
     val exporter =
