Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More Plurals

Browse Source 
(cherry picked from commit bcd6c33ed8aaa1cf81c027f88ce4a954e379a545)
This commit is contained in:
jobobby04 2020-04-17 01:45:06 -04:00 committed by Jobobby04
parent 50097eef9f
commit a7e4c1295d
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt
View File

@ -29,7 +29,7 @@ class MigrationMangaDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
else "")) ?: "" else "")) ?: ""
return MaterialDialog.Builder(activity!!) return MaterialDialog.Builder(activity!!)
.content(confirmString) .content(confirmString)
.positiveText(android.R.string.yes) .positiveText(if (copy) R.string.copy else R.string.migrate)
.negativeText(android.R.string.no) .negativeText(android.R.string.no)
.onPositive { _, _ -> .onPositive { _, _ ->
if (copy) if (copy)

11
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
View File

@ -286,11 +286,8 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
val res = resources val res = resources
if (res != null) { if (res != null) {
activity?.toast( activity?.toast(
res.getString( res.getQuantityString(R.plurals.manga_migrated,
R.string.x_migrations, manaulMigrations, manaulMigrations)
if (manaulMigrations == 0) res.getString(R.string.no)
else "$manaulMigrations"
)
) )
} }
router.popCurrentController() router.popCurrentController()
@ -382,8 +379,8 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
override fun handleBack(): Boolean { override fun handleBack(): Boolean {
activity?.let { activity?.let {
MaterialDialog.Builder(it).title(R.string.stop_migration) MaterialDialog.Builder(it).title(R.string.stop_migration)
.positiveText(R.string.yes) .positiveText(R.string.action_stop)
.negativeText(R.string.no) .negativeText(android.R.string.cancel)
.onPositive { _, _ -> .onPositive { _, _ ->
router.popCurrentController() router.popCurrentController()
migrationsJob?.cancel() migrationsJob?.cancel()

7
app/src/main/res/values/strings.xml
View File

@ -491,9 +491,10 @@
<string name="confirm_migration">Migrate %1$d%2$s manga?</string> <string name="confirm_migration">Migrate %1$d%2$s manga?</string>
<string name="confirm_copy">Copy %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="skipping_x">(skipping %1$d)</string>
<string name="x_migrations">%1$s manga migrated</string> <plurals name="manga_migrated">
<string name="no">No</string> <item quantity="one">%d manga migrated</item>
<string name="yes">Yes</string> <item quantity="other">%d manga migrated</item>
</plurals>
<string name="error_fetching_migration">No chapters found, this manga cannot be used for <string name="error_fetching_migration">No chapters found, this manga cannot be used for
migration</string> migration</string>
<string name="no_alternatives_found">No Alternatives Found</string> <string name="no_alternatives_found">No Alternatives Found</string>