bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-11 04:39:19 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

PM-24234: Add missing plurals (#5886)

Browse Source
This commit is contained in:
David Perez 2025-09-15 14:02:34 -05:00 committed by GitHub
parent 481a8c8fbc
commit 8235045dad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/edititem/EditItemScreen.kt
View File

@ -34,6 +34,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTag 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.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.resource.BitwardenPlurals
import com.bitwarden.ui.platform.resource.BitwardenString import com.bitwarden.ui.platform.resource.BitwardenString
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@ -425,7 +427,11 @@ private fun LazyListScope.advancedOptions(
item(key = "RefreshPeriodItemTypePicker") { item(key = "RefreshPeriodItemTypePicker") {
val possibleRefreshPeriodOptions = AuthenticatorRefreshPeriodOption.entries val possibleRefreshPeriodOptions = AuthenticatorRefreshPeriodOption.entries
val refreshPeriodOptionsWithStrings = possibleRefreshPeriodOptions.associateWith { 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)) Spacer(modifier = Modifier.height(8.dp))
BitwardenMultiSelectButton( BitwardenMultiSelectButton(
@ -436,9 +442,8 @@ private fun LazyListScope.advancedOptions(
.animateItem(), .animateItem(),
label = stringResource(id = BitwardenString.refresh_period), label = stringResource(id = BitwardenString.refresh_period),
options = refreshPeriodOptionsWithStrings.values.toImmutableList(), options = refreshPeriodOptionsWithStrings.values.toImmutableList(),
selectedOption = stringResource( selectedOption = refreshPeriodOptionsWithStrings.getValue(
id = BitwardenString.refresh_period_seconds, key = viewState.itemData.refreshPeriod,
viewState.itemData.refreshPeriod.seconds,
), ),
onOptionSelected = remember(viewState) { onOptionSelected = remember(viewState) {
{ selectedOption -> { selectedOption ->

5
ui/src/main/res/values/strings.xml
View File

@ -998,7 +998,10 @@ Do you want to switch to this account?</string>
<string name="advanced">Advanced</string> <string name="advanced">Advanced</string>
<string name="collapse_advanced_options">Collapse advanced options</string> <string name="collapse_advanced_options">Collapse advanced options</string>
<string name="number_of_digits">Number of digits</string> <string name="number_of_digits">Number of digits</string>
<string name="refresh_period_seconds" tools:ignore="PluralsCandidate">%d seconds</string> <plurals name="refresh_period_seconds">
<item quantity="one">%d second</item>
<item quantity="other">%d seconds</item>
</plurals>
<string name="item_saved">Item saved</string> <string name="item_saved">Item saved</string>
<string name="information">Information</string> <string name="information">Information</string>
<string name="otp_type">OTP type</string> <string name="otp_type">OTP type</string>