diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 3d6cd7ac2..ebffa6d4e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -229,6 +229,11 @@ object Migrations { putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name) } } + if (oldVersion < 65) { + if (preferences.lang().get() in listOf("en-US", "en-GB")) { + preferences.lang().set("en") + } + } return true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 4653ab1d4..174047b66 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -290,7 +290,7 @@ class PreferencesHelper(val context: Context) { fun downloadNewCategories() = flowPrefs.getStringSet(Keys.downloadNewCategories, emptySet()) fun downloadNewCategoriesExclude() = flowPrefs.getStringSet(Keys.downloadNewCategoriesExclude, emptySet()) - fun lang() = prefs.getString(Keys.lang, "") + fun lang() = flowPrefs.getString(Keys.lang, "") fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index ffd99c192..626c4ec8b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -191,8 +191,7 @@ class SettingsGeneralController : SettingsController() { "eo", "es", "es-419", - "en-US", - "en-GB", + "en", "fa", "fi", "fil", diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt index e2fe39e8c..d41bda88e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt @@ -25,7 +25,7 @@ object LocaleHelper { /** * The application's locale. When it's null, the system locale is used. */ - private var appLocale = getLocaleFromString(preferences.lang()) + private var appLocale = getLocaleFromString(preferences.lang().get()) /** * The currently applied locale. Used to avoid losing the selected language after a non locale diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index 3b0b088df..f154a1a83 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -329,6 +329,10 @@ object EXHMigrations { if (oldVersion under 21) { // Setup EH updater task after migrating to WorkManager EHentaiUpdateWorker.scheduleBackground(context) + + if (preferences.lang().get() in listOf("en-US", "en-GB")) { + preferences.lang().set("en") + } } // if (oldVersion under 1) { } (1 is current release version)