Skip to content

Commit 9427fc4

Browse files
committed
Improved strings
Signed-off-by: Arnau Mora <arnyminerz@proton.me>
1 parent 559cd46 commit 9427fc4

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

app/src/main/java/at/bitfire/icsdroid/model/SubscriptionsModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class SubscriptionsModel(application: Application): AndroidViewModel(application
233233
toast.cancel()
234234
Toast.makeText(
235235
context,
236-
context.getString(R.string.backup_imported, newSubscriptions.size),
236+
context.resources.getQuantityString(R.plurals.backup_imported, newSubscriptions.size, newSubscriptions.size),
237237
Toast.LENGTH_SHORT
238238
).show()
239239
}

app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,13 @@ fun ActionOverflowMenu(
322322
if (showImportWarningDialog)
323323
GenericAlertDialog(
324324
title = stringResource(R.string.backup_warning_title),
325-
confirmButton = stringResource(android.R.string.ok) to onBackupImportRequested,
326-
dismissButton = stringResource(android.R.string.cancel) to { showImportWarningDialog = false },
325+
confirmButton = stringResource(android.R.string.ok) to {
326+
showImportWarningDialog = false
327+
onBackupImportRequested()
328+
},
329+
dismissButton = stringResource(android.R.string.cancel) to {
330+
showImportWarningDialog = false
331+
},
327332
onDismissRequest = { showImportWarningDialog = false },
328333
content = { Text(stringResource(R.string.backup_warning_message)) }
329334
)

app/src/main/res/values/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ along with this program. If not, see <a href="https://www.gnu.org/licenses/">ht
147147
<string name="backup_exporting">Exporting…</string>
148148
<string name="backup_exported">Backup exported!</string>
149149
<string name="backup_importing">Importing…</string>
150-
<string name="backup_imported">%d subscriptions imported</string>
150+
<plurals name="backup_imported">
151+
<item quantity="one">%d subscription imported</item>
152+
<item quantity="other">%d subscriptions imported</item>
153+
</plurals>
151154

152155
</resources>

0 commit comments

Comments
 (0)