Merge pull request #17184 from wordpress-mobile/fix/prompts-answers-localization

Fix prompts answers string localization

Author: develric

WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/onboarding/BloggingPromptsOnboardingUiStateMapper.kt

@@ -27,7 +27,9 @@ class BloggingPromptsOnboardingUiStateMapper @Inject constructor() {
         )
 
         val trailingLabel = UiStringPluralRes(
-                R.plurals.my_site_blogging_prompt_card_number_of_answers,
+                0,
+                R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                R.string.my_site_blogging_prompt_card_number_of_answers_other,
                 dummyRespondents.size
         )
 

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptCardBuilder.kt

@@ -13,7 +13,9 @@ import javax.inject.Inject
 class BloggingPromptCardBuilder @Inject constructor() {
     fun build(params: BloggingPromptCardBuilderParams) = params.bloggingPrompt?.let {
         val trailingLabel = UiStringPluralRes(
-                R.plurals.my_site_blogging_prompt_card_number_of_answers,
+                0,
+                R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                R.string.my_site_blogging_prompt_card_number_of_answers_other,
                 params.bloggingPrompt.respondentsCount
         )
 

WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt

@@ -19,6 +19,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.AniUtils.Duration
 import org.wordpress.android.util.DisplayUtils
+import org.wordpress.android.util.StringUtils
 import javax.inject.Inject
 
 class UiHelpers @Inject constructor() {
@@ -41,9 +42,14 @@ class UiHelpers @Inject constructor() {
                             )
                         }.toTypedArray()
                 )
-                is UiStringPluralRes -> context.resources.getQuantityString(
-                        uiString.pluralsRes,
-                        uiString.count,
+                // Current localization process does not support <plurals> resource strings,
+                // so we need to use multiple string resources. Switch to @PluralRes in UiStringPluralRes and
+                // use context.resources.getQuantityString here when <plurals> is supported by localization process.
+                is UiStringPluralRes -> StringUtils.getQuantityString(
+                        context,
+                        uiString.zeroRes,
+                        uiString.oneRes,
+                        uiString.otherRes,
                         uiString.count
                 )
             }

WordPress/src/main/java/org/wordpress/android/ui/utils/UiString.kt

@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.utils
 
-import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 
 /**
@@ -11,5 +10,12 @@ sealed class UiString {
     data class UiStringText(val text: CharSequence) : UiString()
     data class UiStringRes(@StringRes val stringRes: Int) : UiString()
     data class UiStringResWithParams(@StringRes val stringRes: Int, val params: List<UiString>) : UiString()
-    data class UiStringPluralRes(@PluralsRes val pluralsRes: Int, val count: Int) : UiString()
+    // Current localization process does not support <plurals> resource strings,
+    // so we need to use multiple string resources. Switch to @PluralsRes when it is supported by localization process.
+    data class UiStringPluralRes(
+        @StringRes val zeroRes: Int,
+        @StringRes val oneRes: Int,
+        @StringRes val otherRes: Int,
+        val count: Int
+    ) : UiString()
 }

WordPress/src/main/res/values/strings.xml

@@ -2324,10 +2324,8 @@
     <string name="my_site_blogging_prompt_card_attribution_dayone">From <b>DayOne</b></string>
     <string name="my_site_blogging_prompt_card_menu_learn_more">Learn more</string>
     <string name="my_site_blogging_prompt_card_skipped_snackbar">Skipped today\'s blogging prompt</string>
-    <plurals name="my_site_blogging_prompt_card_number_of_answers">
-        <item quantity="one">%d answer</item>
-        <item quantity="other">%d answers</item>
-    </plurals>
+    <string name="my_site_blogging_prompt_card_number_of_answers_one">1 answer</string>
+    <string name="my_site_blogging_prompt_card_number_of_answers_other">%d answers</string>
 
     <!-- site picker -->
     <string name="site_picker_title">Choose site</string>

WordPress/src/test/java/org/wordpress/android/ui/bloggingprompts/onboarding/BloggingPromptsOnboardingUiStateMapperTest.kt

@@ -19,7 +19,12 @@ class BloggingPromptsOnboardingUiStateMapperTest {
             AvatarItem(""),
             AvatarItem(""),
             TrailingLabelTextItem(
-                    UiStringPluralRes(R.plurals.my_site_blogging_prompt_card_number_of_answers, 3),
+                    UiStringPluralRes(
+                            0,
+                            R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                            R.string.my_site_blogging_prompt_card_number_of_answers_other,
+                            3
+                    ),
                     R.attr.colorOnSurface
             )
     )

WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/bloggingprompts/BloggingPromptCardBuilderTest.kt

@@ -6,8 +6,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
 import org.wordpress.android.R.attr
-import org.wordpress.android.R.plurals
 import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel
 import org.wordpress.android.ui.avatars.TrainOfAvatarsItem.AvatarItem
 import org.wordpress.android.ui.avatars.TrainOfAvatarsItem.TrailingLabelTextItem
@@ -26,7 +26,9 @@ private val RESPONDENTS_IN_CARD = listOf(
         AvatarItem("http://avatar3.url"),
         TrailingLabelTextItem(
                 UiStringPluralRes(
-                        plurals.my_site_blogging_prompt_card_number_of_answers,
+                        0,
+                        R.string.my_site_blogging_prompt_card_number_of_answers_one,
+                        R.string.my_site_blogging_prompt_card_number_of_answers_other,
                         NUMBER_OF_RESPONDENTS
                 ), attr.colorOnSurface
         )