diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt index 0e922f53dd..8a0a3d2280 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt @@ -25,6 +25,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -199,7 +200,7 @@ private fun MediaBackupsAreOffBody( daysUntilDeletion: Long ) { Text( - text = stringResource(id = R.string.BackupAlertBottomSheet__your_signal_media_backup_plan, daysUntilDeletion), + text = pluralStringResource(id = R.plurals.BackupAlertBottomSheet__your_signal_media_backup_plan, daysUntilDeletion.toInt(), daysUntilDeletion), textAlign = TextAlign.Center, modifier = Modifier.padding(bottom = 24.dp) ) @@ -238,7 +239,7 @@ private fun DiskFullBody( ) Text( - text = stringResource(id = R.string.BackupAlertBottomSheet__if_you_choose_skip, daysUntilDeletion), // TODO [message-backups] Learn More link + text = pluralStringResource(id = R.plurals.BackupAlertBottomSheet__if_you_choose_skip, daysUntilDeletion.toInt(), daysUntilDeletion), // TODO [message-backups] Learn More link textAlign = TextAlign.Center, modifier = Modifier.padding(bottom = 36.dp) ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d0650b90c..d505c3e357 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6999,7 +6999,10 @@ Media backups are off - Your Signal media backup plan has been canceled because we couldn\'t process your payment. You have %1$d days to download any media stored in your backup. After %1$d days, the media in your backup will be deleted. + + Your Signal media backup plan has been canceled because we couldn\'t process your payment. You have %1$d day to download any media stored in your backup. After %1$d day, the media in your backup will be deleted. + Your Signal media backup plan has been canceled because we couldn\'t process your payment. You have %1$d days to download any media stored in your backup. After %1$d days, the media in your backup will be deleted. + You can begin paying for backups again at any time to continue backing up all your media. @@ -7011,7 +7014,10 @@ Your device does not have enough free space. Free up to %1$s of space to download the media stored in your backup. - If you choose \"Skip\" the media in your backup will be deleted in %1$d days. + + If you choose \"Skip\" the media in your backup will be deleted in %1$d day. + If you choose \"Skip\" the media in your backup will be deleted in %1$d days. + Can\'t process backup payment