From 4e3c407583be8f5148b874b7734387a4a5f3ea51 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 8 May 2020 18:07:21 -0400 Subject: [PATCH] Replace restore completion string with plurals (cherry picked from commit fb97ac47bc25ccc54bbdd6a6b1d3c1695466bff4) --- .../java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt | 2 +- app/src/main/res/values/strings.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt index 496889439..e48f2d334 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt @@ -137,7 +137,7 @@ internal class BackupNotifier(private val context: Context) { with(completeNotificationBuilder) { setContentTitle(context.getString(R.string.restore_completed)) - setContentText(context.getString(R.string.restore_completed_content, timeString, errorCount)) + setContentText(context.resources.getQuantityString(R.plurals.restore_completed_message, errorCount, timeString, errorCount)) // Clear old actions if they exist if (mActions.isNotEmpty()) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 903ea8973..931ca5bfc 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -326,7 +326,10 @@ Backup created Restore completed %02d min, %02d sec - Done in %1$s with %2$s errors + + Done in %1$s with %2$s error + Done in %1$s with %2$s errors + Restore uses sources to fetch data, carrier costs may apply.\n\nMake sure you have installed all necessary extensions and are logged in to sources and tracking services before restoring. Backup is already in progress What do you want to backup?