From 224f08279bc5bb5e5986dd725b6c00240caf59b6 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 1 Apr 2020 22:42:08 -0400 Subject: [PATCH] Reword "Catalogues" to "Sources" for user-facing consistency --- app/shortcuts.xml | 4 ++-- .../eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt | 2 +- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++-- app/src/main/res/menu/bottom_nav.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/shortcuts.xml b/app/shortcuts.xml index 628cc4b966..e3e8c66d63 100644 --- a/app/shortcuts.xml +++ b/app/shortcuts.xml @@ -38,8 +38,8 @@ android:icon="@drawable/sc_explore_48dp" android:shortcutDisabledMessage="@string/app_not_available" android:shortcutId="show_catalogues" - android:shortcutLongLabel="@string/label_catalogues" - android:shortcutShortLabel="@string/label_catalogues"> + android:shortcutLongLabel="@string/label_sources" + android:shortcutShortLabel="@string/label_sources"> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt index 21bdd03b89..e3280d7b55 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt @@ -72,7 +72,7 @@ class CatalogueController : NucleusController(), * @return title. */ override fun getTitle(): String? { - return applicationContext?.getString(R.string.label_catalogues) + return applicationContext?.getString(R.string.label_sources) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 7a934c36e6..7013d2c367 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -82,7 +82,7 @@ class MainActivity : BaseActivity() { R.id.nav_library -> setRoot(LibraryController(), id) R.id.nav_updates -> setRoot(UpdatesController(), id) R.id.nav_history -> setRoot(HistoryController(), id) - R.id.nav_catalogues -> setRoot(CatalogueController(), id) + R.id.nav_sources -> setRoot(CatalogueController(), id) R.id.nav_more -> setRoot(MoreController(), id) } } else { @@ -196,7 +196,7 @@ class MainActivity : BaseActivity() { SHORTCUT_LIBRARY -> setSelectedDrawerItem(R.id.nav_library) SHORTCUT_RECENTLY_UPDATED -> setSelectedDrawerItem(R.id.nav_updates) SHORTCUT_RECENTLY_READ -> setSelectedDrawerItem(R.id.nav_history) - SHORTCUT_CATALOGUES -> setSelectedDrawerItem(R.id.nav_catalogues) + SHORTCUT_CATALOGUES -> setSelectedDrawerItem(R.id.nav_sources) SHORTCUT_EXTENSIONS -> { setSelectedDrawerItem(R.id.nav_more) router.pushController(ExtensionController().withFadeTransaction()) diff --git a/app/src/main/res/menu/bottom_nav.xml b/app/src/main/res/menu/bottom_nav.xml index c38edc604f..1c94cdef65 100644 --- a/app/src/main/res/menu/bottom_nav.xml +++ b/app/src/main/res/menu/bottom_nav.xml @@ -13,9 +13,9 @@ android:icon="@drawable/ic_history_24dp" android:title="@string/label_recent_manga" /> + android:title="@string/label_sources" /> Library Updates History - Catalogues + Sources Categories Backup Source migration @@ -581,7 +581,7 @@ No downloads No recent chapters No recently read manga - Your library is empty, add series to your library from the catalogues. + Your library is empty, add series to your library from the sources. You have no categories. Hit the plus button to create one for organizing your library. Failed to bypass Cloudflare Please update the WebView app for better compatibility