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

@@ -6,7 +6,7 @@ ext {
     extName = 'Bato.to'
     pkgNameSuffix = 'all.batoto'
     extClass = '.BatoToFactory'
-    extVersionCode = 32
+    extVersionCode = 34
     isNsfw = true
 }
 

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\"])"
         }
     }

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"),