mirror of
https://github.com/bitwarden/android.git
synced 2026-11-18 06:34:24 -06:00
[PM-25133] Plural forms (#5773)
Co-authored-by: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Co-authored-by: Patrick Honkonen <phonkonen@bitwarden.com>
This commit is contained in:
co-authored by
Patrick Honkonen
Patrick Honkonen
parent
aa39e6c6be
commit
41e499fdf5
+7
-2
@@ -5,8 +5,10 @@ import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.bitwarden.ui.platform.base.BaseViewModel
|
||||
import com.bitwarden.ui.platform.base.util.isValidEmail
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
|
||||
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
|
||||
@@ -321,8 +323,11 @@ class CompleteRegistrationViewModel @Inject constructor(
|
||||
it.copy(
|
||||
dialog = CompleteRegistrationDialog.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x
|
||||
.asText(MIN_PASSWORD_LENGTH),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x
|
||||
.asPluralsText(
|
||||
quantity = MIN_PASSWORD_LENGTH,
|
||||
args = arrayOf(MIN_PASSWORD_LENGTH),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
+7
-2
@@ -24,11 +24,12 @@ import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.drawBehind
|
||||
import androidx.compose.ui.graphics.TransformOrigin
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.res.pluralStringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
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 com.bitwarden.ui.platform.theme.BitwardenTheme
|
||||
import com.bitwarden.ui.util.asText
|
||||
@@ -154,7 +155,11 @@ private fun MinimumCharacterCount(
|
||||
}
|
||||
Spacer(modifier = Modifier.width(2.dp))
|
||||
Text(
|
||||
text = stringResource(BitwardenString.minimum_characters, minimumCharacterCount),
|
||||
text = pluralStringResource(
|
||||
id = BitwardenPlurals.minimum_characters,
|
||||
count = minimumCharacterCount,
|
||||
formatArgs = arrayOf(minimumCharacterCount),
|
||||
),
|
||||
color = BitwardenTheme.colorScheme.text.secondary,
|
||||
style = BitwardenTheme.typography.labelSmall,
|
||||
)
|
||||
|
||||
+7
-2
@@ -5,8 +5,10 @@ import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.bitwarden.ui.platform.base.BaseViewModel
|
||||
import com.bitwarden.ui.platform.base.util.orNullIfBlank
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason
|
||||
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
|
||||
@@ -199,8 +201,11 @@ class ResetPasswordViewModel @Inject constructor(
|
||||
it.copy(
|
||||
dialogState = ResetPasswordState.DialogState.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x
|
||||
.asText(MIN_PASSWORD_LENGTH),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x
|
||||
.asPluralsText(
|
||||
quantity = MIN_PASSWORD_LENGTH,
|
||||
args = arrayOf(MIN_PASSWORD_LENGTH),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
+7
-2
@@ -4,8 +4,10 @@ import android.os.Parcelable
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.bitwarden.ui.platform.base.BaseViewModel
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
|
||||
import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
|
||||
@@ -111,8 +113,11 @@ class SetPasswordViewModel @Inject constructor(
|
||||
it.copy(
|
||||
dialogState = SetPasswordState.DialogState.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x
|
||||
.asText(MIN_PASSWORD_LENGTH),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x
|
||||
.asPluralsText(
|
||||
quantity = MIN_PASSWORD_LENGTH,
|
||||
args = arrayOf(MIN_PASSWORD_LENGTH),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
+7
-1
@@ -14,8 +14,10 @@ import com.bitwarden.network.model.PolicyTypeJson
|
||||
import com.bitwarden.ui.platform.base.BackgroundEvent
|
||||
import com.bitwarden.ui.platform.base.BaseViewModel
|
||||
import com.bitwarden.ui.platform.components.snackbar.model.BitwardenSnackbarData
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.bitwarden.vault.CipherView
|
||||
import com.bitwarden.vault.DecryptCipherListResult
|
||||
@@ -1945,7 +1947,11 @@ class VaultAddEditViewModel @Inject constructor(
|
||||
is BreachCountResult.Success -> {
|
||||
VaultAddEditState.DialogState.Generic(
|
||||
message = if (result.breachCount > 0) {
|
||||
BitwardenString.password_exposed.asText(result.breachCount)
|
||||
BitwardenPlurals.password_exposed
|
||||
.asPluralsText(
|
||||
quantity = result.breachCount,
|
||||
args = arrayOf(result.breachCount),
|
||||
)
|
||||
} else {
|
||||
BitwardenString.password_safe.asText()
|
||||
},
|
||||
|
||||
@@ -13,8 +13,10 @@ import com.bitwarden.ui.platform.base.BackgroundEvent
|
||||
import com.bitwarden.ui.platform.base.BaseViewModel
|
||||
import com.bitwarden.ui.platform.components.icon.model.IconData
|
||||
import com.bitwarden.ui.platform.components.snackbar.model.BitwardenSnackbarData
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.bitwarden.ui.util.concat
|
||||
import com.bitwarden.vault.CipherView
|
||||
@@ -978,7 +980,10 @@ class VaultItemViewModel @Inject constructor(
|
||||
is BreachCountResult.Success -> {
|
||||
VaultItemState.DialogState.Generic(
|
||||
message = if (result.breachCount > 0) {
|
||||
BitwardenString.password_exposed.asText(result.breachCount)
|
||||
BitwardenPlurals.password_exposed.asPluralsText(
|
||||
quantity = result.breachCount,
|
||||
args = arrayOf(result.breachCount),
|
||||
)
|
||||
} else {
|
||||
BitwardenString.password_safe.asText()
|
||||
},
|
||||
|
||||
+6
-1
@@ -5,7 +5,9 @@ import app.cash.turbine.test
|
||||
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
|
||||
import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager
|
||||
import com.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
|
||||
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength.LEVEL_0
|
||||
@@ -590,7 +592,10 @@ class CompleteRegistrationViewModelTest : BaseViewModelTest() {
|
||||
passwordInput = input,
|
||||
dialog = CompleteRegistrationDialog.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x.asText(12),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x.asPluralsText(
|
||||
quantity = 12,
|
||||
args = arrayOf(12),
|
||||
),
|
||||
),
|
||||
)
|
||||
viewModel.trySendAction(CompleteRegistrationAction.CallToActionClick)
|
||||
|
||||
+6
-2
@@ -3,7 +3,9 @@ package com.x8bit.bitwarden.ui.auth.feature.resetPassword
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import app.cash.turbine.test
|
||||
import com.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason
|
||||
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength
|
||||
@@ -133,8 +135,10 @@ class ResetPasswordViewModelTest : BaseViewModelTest() {
|
||||
resetReason = ForcePasswordResetReason.ADMIN_FORCE_PASSWORD_RESET,
|
||||
dialogState = ResetPasswordState.DialogState.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x
|
||||
.asText(MIN_PASSWORD_LENGTH),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x.asPluralsText(
|
||||
quantity = MIN_PASSWORD_LENGTH,
|
||||
args = arrayOf(MIN_PASSWORD_LENGTH),
|
||||
),
|
||||
),
|
||||
passwordInput = password,
|
||||
passwordStrengthState = PasswordStrengthState.WEAK_1,
|
||||
|
||||
+6
-2
@@ -3,7 +3,9 @@ package com.x8bit.bitwarden.ui.auth.feature.setpassword
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import app.cash.turbine.test
|
||||
import com.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
|
||||
import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
|
||||
@@ -87,8 +89,10 @@ class SetPasswordViewModelTest : BaseViewModelTest() {
|
||||
DEFAULT_STATE.copy(
|
||||
dialogState = SetPasswordState.DialogState.Error(
|
||||
title = BitwardenString.an_error_has_occurred.asText(),
|
||||
message = BitwardenString.master_password_length_val_message_x
|
||||
.asText(MIN_PASSWORD_LENGTH),
|
||||
message = BitwardenPlurals.master_password_length_val_message_x.asPluralsText(
|
||||
quantity = MIN_PASSWORD_LENGTH,
|
||||
args = arrayOf(MIN_PASSWORD_LENGTH),
|
||||
),
|
||||
),
|
||||
passwordInput = password,
|
||||
retypePasswordInput = password,
|
||||
|
||||
+6
-1
@@ -20,8 +20,10 @@ import com.bitwarden.network.model.SyncResponseJson
|
||||
import com.bitwarden.send.SendView
|
||||
import com.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.bitwarden.ui.platform.components.snackbar.model.BitwardenSnackbarData
|
||||
import com.bitwarden.ui.platform.resource.BitwardenPlurals
|
||||
import com.bitwarden.ui.platform.resource.BitwardenString
|
||||
import com.bitwarden.ui.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.bitwarden.vault.CipherListView
|
||||
import com.bitwarden.vault.CipherView
|
||||
@@ -2439,7 +2441,10 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
assertEquals(
|
||||
loginState.copy(
|
||||
dialog = VaultAddEditState.DialogState.Generic(
|
||||
message = BitwardenString.password_exposed.asText(breachCount),
|
||||
message = BitwardenPlurals.password_exposed.asPluralsText(
|
||||
quantity = breachCount,
|
||||
args = arrayOf(breachCount),
|
||||
),
|
||||
),
|
||||
),
|
||||
awaitItem(),
|
||||
|
||||
+6
-1
@@ -13,8 +13,10 @@ import com.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.bitwarden.ui.platform.components.icon.model.IconData
|
||||
import com.bitwarden.ui.platform.components.snackbar.model.BitwardenSnackbarData
|
||||
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.util.Text
|
||||
import com.bitwarden.ui.util.asPluralsText
|
||||
import com.bitwarden.ui.util.asText
|
||||
import com.bitwarden.ui.util.concat
|
||||
import com.bitwarden.vault.CipherView
|
||||
@@ -1289,7 +1291,10 @@ class VaultItemViewModelTest : BaseViewModelTest() {
|
||||
assertEquals(
|
||||
loginState.copy(
|
||||
dialog = VaultItemState.DialogState.Generic(
|
||||
message = BitwardenString.password_exposed.asText(breachCount),
|
||||
message = BitwardenPlurals.password_exposed.asPluralsText(
|
||||
quantity = breachCount,
|
||||
args = arrayOf(breachCount),
|
||||
),
|
||||
),
|
||||
),
|
||||
awaitItem(),
|
||||
|
||||
Reference in New Issue
Block a user