Merge pull request #521 from Lucchetto/fix-jvm-plural-fallback

Fix plural fallback when given quantity not defined on JVM
icerockdev · May 22, 2024 · d0a9c3c · d0a9c3c
2 parents 1f6c2af + 883a892
commit d0a9c3c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/resources/src/jvmMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt b/resources/src/jvmMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt
@@ -21,7 +21,11 @@ actual class PluralsResource(
         val selectedVariant = pluralRules.select(quantity.toDouble())
         val keyWithQuantity = "$key.$selectedVariant"
 
-        return resourceBundle.getString(keyWithQuantity)
+        return if (resourceBundle.containsKey(keyWithQuantity)) {
+            resourceBundle.getString(keyWithQuantity)
+        } else {
+            resourceBundle.getString("$key.${PluralRules.KEYWORD_OTHER}")
+        }
     }
 
     fun localized(locale: Locale = Locale.getDefault(), quantity: Int): String =

diff --git a/samples/resources-gallery/mpp-library/build.gradle.kts b/samples/resources-gallery/mpp-library/build.gradle.kts
@@ -49,6 +49,7 @@ android {
 
     lint.disable.add("ImpliedQuantity")
     lint.disable.add("MissingTranslation")
+    lint.disable.add("MissingQuantity")
 }
 
 kotlin {

diff --git a/samples/resources-gallery/mpp-library/src/commonMain/moko-resources/base/plurals-test.xml b/samples/resources-gallery/mpp-library/src/commonMain/moko-resources/base/plurals-test.xml
@@ -25,4 +25,8 @@
         <item quantity="two">plurals-interop: two</item>
         <item quantity="other">plurals-interop: other</item>
     </plurals>
+    <plural name="test.plural.fallback">
+        <item quantity="one">one</item>
+        <item quantity="other">other</item>
+    </plural>
 </resources>
diff --git a/samples/resources-gallery/mpp-library/src/commonMain/moko-resources/ru/plurals-test.xml b/samples/resources-gallery/mpp-library/src/commonMain/moko-resources/ru/plurals-test.xml
@@ -33,4 +33,8 @@
         <item quantity="two">%s two</item>
         <item quantity="other">%s other</item>
     </plural>
+    <plural name="test.plural.fallback">
+        <item quantity="one">один</item>
+        <item quantity="other">другое</item>
+    </plural>
 </resources>
diff --git a/...es-gallery/mpp-library/src/commonTest/kotlin/com/icerock/library/PluralResourceEnTests.kt b/...es-gallery/mpp-library/src/commonTest/kotlin/com/icerock/library/PluralResourceEnTests.kt
@@ -50,6 +50,18 @@ class PluralResourceEnTests : BaseStringResourceTests("en") {
         actual = MR.plurals.test_plural.desc(22)
     )
 
+    @Test
+    fun checkPluralFallback1() = pluralTest(
+        expected = "one",
+        actual = MR.plurals.test_plural_fallback.desc(1)
+    )
+
+    @Test
+    fun checkPluralFallback2() = pluralTest(
+        expected = "other",
+        actual = MR.plurals.test_plural_fallback.desc(2)
+    )
+
     @Test
     fun checkVariantsPlurals() = pluralTest(
         expected = """

diff --git a/...es-gallery/mpp-library/src/commonTest/kotlin/com/icerock/library/PluralResourceRuTests.kt b/...es-gallery/mpp-library/src/commonTest/kotlin/com/icerock/library/PluralResourceRuTests.kt
@@ -6,9 +6,7 @@ package com.icerock.library
 
 import com.icerockdev.library.MR
 import com.icerockdev.library.Testing
-import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.resources.desc.desc
-import kotlin.test.BeforeTest
 import kotlin.test.Ignore
 import kotlin.test.Test
 
@@ -52,6 +50,18 @@ class PluralResourceRuTests : BaseStringResourceTests("ru") {
         actual = MR.plurals.test_plural.desc(22)
     )
 
+    @Test
+    fun checkPluralFallback1() = pluralTest(
+        expected = "один",
+        actual = MR.plurals.test_plural_fallback.desc(1)
+    )
+
+    @Test
+    fun checkPluralFallback2() = pluralTest(
+        expected = "другое",
+        actual = MR.plurals.test_plural_fallback.desc(2)
+    )
+
     @Test
     fun checkVariantsPlurals() = pluralTest(
         expected = """