diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index c814712384..5d0ff26620 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -492,7 +492,8 @@ class LibraryUpdateService( color = ContextCompat.getColor(this@LibraryUpdateService, R.color.colorAccentLight) val chaptersNames = if (chapterNames.size > 5) { "${chapterNames.take(4).joinToString(", ")}, " + - getString(R.string.notification_and_n_more, (chapterNames.size - 4)) + resources.getQuantityString(R.plurals.notification_and_n_more, + (chapterNames.size - 4), (chapterNames.size - 4)) } else chapterNames.joinToString(", ") setContentText(chaptersNames) setStyle(NotificationCompat.BigTextStyle().bigText(chaptersNames)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index 045ec44f48..c6712cf810 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -42,8 +42,10 @@ class ExtensionUpdateJob : Job() { ) ) val extNames = if (names.size > 5) { - "${names.take(4).joinToString(", ")}, " + context.getString( - R.string.notification_and_n_more, (names.size - 4) + "${names.take(4).joinToString(", ")}, " + + context.resources.getQuantityString( + R.plurals.notification_and_n_more_ext, + (names.size - 4), (names.size - 4) ) } else names.joinToString(", ") setContentText(extNames) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt index fd2e6093a2..60f72ac836 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt @@ -22,10 +22,10 @@ class MigrationMangaDialog(bundle: Bundle? = null) : DialogController(bundle) } override fun onCreateDialog(savedViewState: Bundle?): Dialog { - val confirmRes = if (copy) R.string.confirm_copy else R.string.confirm_migration - val confirmString = applicationContext?.getString(confirmRes, mangaSet, ( - if (mangaSkipped > 0) - " " + applicationContext?.getString(R.string.skipping_x, mangaSkipped) ?: "" + val confirmRes = if (copy) R.plurals.confirm_copy else R.plurals.confirm_migration + val confirmString = applicationContext?.resources?.getQuantityString(confirmRes, mangaSet, + mangaSet, ( + if (mangaSkipped > 0) " " + applicationContext?.getString(R.string.skipping_x, mangaSkipped) else "")) ?: "" return MaterialDialog(activity!!).show { message(text = confirmString) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1f179981a4..94e2fd08c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -474,8 +474,14 @@ All Unread Are you sure you want to delete selected chapters? - Migrate %1$d%2$s manga? - Copy %1$d%2$s manga? + + Migrate %1$d%2$s manga? + Migrate %1$d%2$s manga? + + + Copy %1$d%2$s manga? + Copy %1$d%2$s manga? + (skipping %1$d) %d manga migrated @@ -570,11 +576,17 @@ Update progress: %1$d/%2$d New chapters found - For %d titles + For %d title For %d titles - and %1$d more chapters. - and %1$d more extensions. + + and %1$d more chapter. + and %1$d more chapters. + + + and %1$d more extension. + and %1$d more extensions. + Failed to update cover Please add the manga to your library before doing this Sync canceled