From 8235045dad1bb8e967af6a4b6ca84162678a2318 Mon Sep 17 00:00:00 2001 From: David Perez Date: Mon, 15 Sep 2025 14:02:34 -0500 Subject: [PATCH] PM-24234: Add missing plurals (#5886) --- .../feature/edititem/EditItemScreen.kt | 13 +++++++++---- ui/src/main/res/values/strings.xml | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemScreen.kt index 7d0aac7fe9..12ec4af761 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemScreen.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag @@ -64,6 +65,7 @@ import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.resource.BitwardenDrawable +import com.bitwarden.ui.platform.resource.BitwardenPlurals import com.bitwarden.ui.platform.resource.BitwardenString import kotlinx.collections.immutable.toImmutableList @@ -425,7 +427,11 @@ private fun LazyListScope.advancedOptions( item(key = "RefreshPeriodItemTypePicker") { val possibleRefreshPeriodOptions = AuthenticatorRefreshPeriodOption.entries val refreshPeriodOptionsWithStrings = possibleRefreshPeriodOptions.associateWith { - stringResource(id = BitwardenString.refresh_period_seconds, it.seconds) + pluralStringResource( + id = BitwardenPlurals.refresh_period_seconds, + count = it.seconds, + formatArgs = arrayOf(it.seconds), + ) } Spacer(modifier = Modifier.height(8.dp)) BitwardenMultiSelectButton( @@ -436,9 +442,8 @@ private fun LazyListScope.advancedOptions( .animateItem(), label = stringResource(id = BitwardenString.refresh_period), options = refreshPeriodOptionsWithStrings.values.toImmutableList(), - selectedOption = stringResource( - id = BitwardenString.refresh_period_seconds, - viewState.itemData.refreshPeriod.seconds, + selectedOption = refreshPeriodOptionsWithStrings.getValue( + key = viewState.itemData.refreshPeriod, ), onOptionSelected = remember(viewState) { { selectedOption -> diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index bb3d90b7f0..cc18e9c0ce 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -998,7 +998,10 @@ Do you want to switch to this account? Advanced Collapse advanced options Number of digits - %d seconds + + %d second + %d seconds + Item saved Information OTP type