From d88fb5f5955fbb8ca9edf6eb846b96a94d47ed81 Mon Sep 17 00:00:00 2001
From: beerpsi <92439990+beerpiss@users.noreply.github.com>
Date: Sat, 13 Jan 2024 14:35:14 +0700
Subject: [PATCH] Batoto: Merge English and English (US) (#212)

* Batoto: Fix popular/latest in en_US

* Batoto: Merge English with English (US)
---
 src/all/batoto/build.gradle                                    | 2 +-
 .../src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt     | 2 +-
 .../eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/all/batoto/build.gradle b/src/all/batoto/build.gradle
index 3589fc1cd..f7dec7093 100644
--- a/src/all/batoto/build.gradle
+++ b/src/all/batoto/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Bato.to'
     pkgNameSuffix = 'all.batoto'
     extClass = '.BatoToFactory'
-    extVersionCode = 32
+    extVersionCode = 34
     isNsfw = true
 }
 
diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
index d4969e621..2ad1a537b 100644
--- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
+++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
@@ -109,7 +109,7 @@ open class BatoTo(
     override fun latestUpdatesSelector(): String {
         return when (siteLang) {
             "" -> "div#series-list div.col"
-            "en" -> "div#series-list div.col.no-flag"
+            "en,en_us" -> "div#series-list div.col.no-flag"
             else -> "div#series-list div.col:has([data-lang=\"$siteLang\"])"
         }
     }
diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
index 2a4ee05ee..61848f3af 100644
--- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
+++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
@@ -11,7 +11,7 @@ class LanguageOption(val lang: String, val siteLang: String = lang)
 private val languages = listOf(
     LanguageOption("all", ""),
     // Lang options from publish.bato.to
-    LanguageOption("en"),
+    LanguageOption("en", "en,en_us"),
     LanguageOption("ar"),
     LanguageOption("bg"),
     LanguageOption("zh"),
@@ -58,7 +58,6 @@ private val languages = listOf(
     LanguageOption("zh-Hans", "zh_hk"),
     LanguageOption("zh-Hant", "zh_tw"),
     LanguageOption("hr"),
-    LanguageOption("en-US", "en_us"),
     LanguageOption("eo"),
     LanguageOption("et"),
     LanguageOption("fo"),