github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More Plurals

Browse source
This commit is contained in:
Jay 2020-01-12 14:39:07 -08:00
parent 264f3cd8d3
commit bcd6c33ed8
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
View file

@ -383,7 +383,8 @@ class BackupRestoreService : Service() {
content.add(resources.getQuantityString(R.plurals.sources_missing, content.add(resources.getQuantityString(R.plurals.sources_missing,
sourceMissingCount, sourceMissingCount)) sourceMissingCount, sourceMissingCount))
if (lincensedManga > 0) if (lincensedManga > 0)
content.add(getString(R.string.x_licensed_manga, lincensedManga)) content.add(resources.getQuantityString(R.plurals.licensed_manga, lincensedManga,
lincensedManga))
val trackingErrors = trackingErrors.distinct() val trackingErrors = trackingErrors.distinct()
if (trackingErrors.isNotEmpty()) { if (trackingErrors.isNotEmpty()) {
val trackingErrorsString = trackingErrors.distinct().joinToString("\n") val trackingErrorsString = trackingErrors.distinct().joinToString("\n")

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(activity!!).show { return MaterialDialog(activity!!).show {
message(text = confirmString) message(text = confirmString)
positiveButton(android.R.string.yes) { positiveButton(if (copy) R.string.copy else R.string.migrate) {
if (copy) (targetController as? MigrationListController)?.copyMangas() if (copy) (targetController as? MigrationListController)?.copyMangas()
else (targetController as? MigrationListController)?.migrateMangas() else (targetController as? MigrationListController)?.migrateMangas()
} }

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

@ -274,11 +274,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()
@ -373,11 +370,11 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
activity?.let { activity?.let {
MaterialDialog(it).show { MaterialDialog(it).show {
title(R.string.stop_migration) title(R.string.stop_migration)
positiveButton (R.string.yes) { positiveButton (R.string.action_stop) {
router.popCurrentController() router.popCurrentController()
migrationsJob?.cancel() migrationsJob?.cancel()
} }
negativeButton(R.string.no) negativeButton(android.R.string.cancel)
} }
} }
return true return true

16
app/src/main/res/values/strings.xml
View file

@ -329,7 +329,10 @@
<item quantity="one">%d source missing</item> <item quantity="one">%d source missing</item>
<item quantity="other">%d sources missing</item> <item quantity="other">%d sources missing</item>
</plurals> </plurals>
<string name="x_licensed_manga">%1$d manga are now licensed and could not be restored</string> <plurals name="licensed_manga">
<item quantity="one">%d manga is now licensed and could not be restored</item>
<item quantity="other">%d manga are now licensed and could not be restored</item>
</plurals>
<string name="not_logged_into">Not logged into %1$s</string> <string name="not_logged_into">Not logged into %1$s</string>
<!-- Advanced section --> <!-- Advanced section -->
@ -352,8 +355,8 @@
<string name="pref_refresh_library_tracking">Refresh tracking metadata</string> <string name="pref_refresh_library_tracking">Refresh tracking metadata</string>
<string name="pref_refresh_library_tracking_summary">Updates status, score and last chapter read from the tracking services</string> <string name="pref_refresh_library_tracking_summary">Updates status, score and last chapter read from the tracking services</string>
<string name="pref_clean_downloads">Clean up downloaded chapters</string> <string name="pref_clean_downloads">Clean up downloaded chapters</string>
<string name="pref_clean_downloads_summary">Deletes orphaned, tmp, and read chapter folders <string name="pref_clean_downloads_summary">Deletes non-existent, partially downloaded,
for entire library for each Manga</string> and read chapter folders</string>
<!-- About section --> <!-- About section -->
<string name="version">Version</string> <string name="version">Version</string>
@ -460,9 +463,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>