Skip to content

Commit 699b288

Browse files
committed
Moving UiStringPluralRes to use multiple string resources.
1 parent 28814c2 commit 699b288

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringText
1919
import org.wordpress.android.util.AniUtils
2020
import org.wordpress.android.util.AniUtils.Duration
2121
import org.wordpress.android.util.DisplayUtils
22+
import org.wordpress.android.util.StringUtils
2223
import javax.inject.Inject
2324

2425
class UiHelpers @Inject constructor() {
@@ -41,9 +42,14 @@ class UiHelpers @Inject constructor() {
4142
)
4243
}.toTypedArray()
4344
)
44-
is UiStringPluralRes -> context.resources.getQuantityString(
45-
uiString.pluralsRes,
46-
uiString.count,
45+
// Current localization process does not support <plurals> resource strings,
46+
// so we need to use multiple string resources. Switch to @PluralRes in UiStringPluralRes and
47+
// use context.resources.getQuantityString here when <plurals> is supported by localization process.
48+
is UiStringPluralRes -> StringUtils.getQuantityString(
49+
context,
50+
uiString.zeroRes,
51+
uiString.oneRes,
52+
uiString.otherRes,
4753
uiString.count
4854
)
4955
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.wordpress.android.ui.utils
22

3-
import androidx.annotation.PluralsRes
43
import androidx.annotation.StringRes
54

65
/**
@@ -11,5 +10,12 @@ sealed class UiString {
1110
data class UiStringText(val text: CharSequence) : UiString()
1211
data class UiStringRes(@StringRes val stringRes: Int) : UiString()
1312
data class UiStringResWithParams(@StringRes val stringRes: Int, val params: List<UiString>) : UiString()
14-
data class UiStringPluralRes(@PluralsRes val pluralsRes: Int, val count: Int) : UiString()
13+
// Current localization process does not support <plurals> resource strings,
14+
// so we need to use multiple string resources. Switch to @PluralsRes when it is supported by localization process.
15+
data class UiStringPluralRes(
16+
@StringRes val zeroRes: Int,
17+
@StringRes val oneRes: Int,
18+
@StringRes val otherRes: Int,
19+
val count: Int
20+
) : UiString()
1521
}

0 commit comments

Comments
 (0)