From a7e4c1295d2ac052baac23be9b1f1ae40dac17c7 Mon Sep 17 00:00:00 2001
From: jobobby04 <jobobby04@users.noreply.github.com>
Date: Fri, 17 Apr 2020 01:45:06 -0400
Subject: [PATCH] More Plurals

(cherry picked from commit bcd6c33ed8aaa1cf81c027f88ce4a954e379a545)
---
 .../tachiyomi/ui/migration/MigrationMangaDialog.kt    |  2 +-
 .../manga/process/MigrationListController.kt          | 11 ++++-------
 app/src/main/res/values/strings.xml                   |  7 ++++---
 3 files changed, 9 insertions(+), 11 deletions(-)

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 c9c2057b4..ec53b2785 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
@@ -29,7 +29,7 @@ class MigrationMangaDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
             else "")) ?: ""
         return MaterialDialog.Builder(activity!!)
             .content(confirmString)
-            .positiveText(android.R.string.yes)
+            .positiveText(if (copy) R.string.copy else R.string.migrate)
             .negativeText(android.R.string.no)
             .onPositive { _, _ ->
                 if (copy)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index f6e2b014c..1006384cd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -286,11 +286,8 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
             val res = resources
             if (res != null) {
                 activity?.toast(
-                    res.getString(
-                        R.string.x_migrations,
-                        if (manaulMigrations == 0) res.getString(R.string.no)
-                        else "$manaulMigrations"
-                    )
+                    res.getQuantityString(R.plurals.manga_migrated,
+                        manaulMigrations, manaulMigrations)
                 )
             }
             router.popCurrentController()
@@ -382,8 +379,8 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
     override fun handleBack(): Boolean {
         activity?.let {
             MaterialDialog.Builder(it).title(R.string.stop_migration)
-                .positiveText(R.string.yes)
-                .negativeText(R.string.no)
+                .positiveText(R.string.action_stop)
+                .negativeText(android.R.string.cancel)
                 .onPositive { _, _ ->
                     router.popCurrentController()
                     migrationsJob?.cancel()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 323b519ce..c43972abd 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -491,9 +491,10 @@
     <string name="confirm_migration">Migrate %1$d%2$s manga?</string>
     <string name="confirm_copy">Copy %1$d%2$s manga?</string>
     <string name="skipping_x">(skipping %1$d)</string>
-    <string name="x_migrations">%1$s manga migrated</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
+    <plurals name="manga_migrated">
+        <item quantity="one">%d manga migrated</item>
+        <item quantity="other">%d manga migrated</item>
+    </plurals>
     <string name="error_fetching_migration">No chapters found, this manga cannot be used for
         migration</string>
     <string name="no_alternatives_found">No Alternatives Found</string>