Remove en-GB option since we don't actually localize different English locales

app/build.gradle.kts

@@ -30,7 +30,7 @@ android {
         minSdkVersion(AndroidConfig.minSdk)
         targetSdkVersion(AndroidConfig.targetSdk)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = 64
+        versionCode = 65
         versionName = "0.11.1"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -232,6 +232,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
         }
 

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -282,7 +282,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)
 

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt

@@ -128,7 +128,7 @@ class LibraryItem(
         val tag = if (minus) { query.substringAfter("-") } else query
         return when (sourceName.contains(tag, true)) {
             false -> containsGenre(query, genres)
-            else  -> !minus
+            else -> !minus
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt

@@ -176,8 +176,7 @@ class SettingsGeneralController : SettingsController() {
                     "eo",
                     "es",
                     "es-419",
-                    "en-US",
-                    "en-GB",
+                    "en",
                     "fa",
                     "fi",
                     "fil",

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