From 7e552c017b6a9f6ed7dbab729ad19b1081617adb Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 4 Oct 2020 15:19:17 -0400
Subject: [PATCH] Emerald: update languages (fixes #4455)

---
 src/all/emerald/build.gradle                  |  2 +-
 .../extension/all/emerald/Emerald.kt          |  2 +-
 .../extension/all/emerald/EmeraldFactory.kt   | 66 ++++++++++++-------
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/all/emerald/build.gradle b/src/all/emerald/build.gradle
index 8c10dfae3..d8ba7e757 100644
--- a/src/all/emerald/build.gradle
+++ b/src/all/emerald/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Emerald'
     pkgNameSuffix = 'all.emerald'
     extClass = '.EmeraldFactory'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '1.2'
 }
 
diff --git a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/Emerald.kt b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/Emerald.kt
index 4813713e0..51a465952 100644
--- a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/Emerald.kt
+++ b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/Emerald.kt
@@ -46,7 +46,7 @@ open class Emerald(
         return manga
     }
 
-    override fun latestUpdatesNextPageSelector() = "div.browse-pager:contains(order) a.page-link:contains(»)"
+    override fun latestUpdatesNextPageSelector() = "div.browse-pager:contains(order) .page-item:not(.disabled) a.page-link:contains(»)"
 
     override fun popularMangaRequest(page: Int): Request {
         return GET("$baseUrl/browse?langs=$Mtlang&sort=views_w&page=$page")
diff --git a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt
index 715998ceb..57a226c60 100644
--- a/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt
+++ b/src/all/emerald/src/eu/kanade/tachiyomi/extension/all/emerald/EmeraldFactory.kt
@@ -14,27 +14,47 @@ class Batoto(tachiLang: String, siteLang: String) :
     Emerald("Bato.to", "https://bato.to", tachiLang, siteLang)
 
 private val languages = listOf(
-    Pair("ar", "arabic"),
-    Pair("pt-BR", "brazilian"),
-    Pair("cs", "czech"),
-    Pair("da", "danish"),
-    Pair("nl", "dutch"),
-    Pair("en", "english"),
-    Pair("fil", "filipino"),
-    Pair("fr", "french"),
-    Pair("de", "german"),
-    Pair("el", "greek"),
-    Pair("iw", "hebrew"),
-    Pair("hu", "hungarian"),
-    Pair("id", "indonesian"),
-    Pair("it", "italian"),
-    Pair("ms", "malay"),
-    Pair("pl", "polish"),
-    Pair("pt", "portuguese"),
-    Pair("ro", "romanian"),
-    Pair("ru", "russian"),
-    Pair("es", "spanish"),
-    Pair("th", "thai"),
-    Pair("tr", "turkish"),
-    Pair("vi", "vietnamese")
+    Pair("ar", "ar"),
+    Pair("bg", "bg"),
+    Pair("cs", "cs"),
+    Pair("da", "da"),
+    Pair("de", "de"),
+    Pair("el", "el"),
+    Pair("en", "en"),
+    Pair("es", "es"),
+    Pair("es-419", "es_419"),
+    Pair("eu", "eu"),
+    Pair("fa", "fa"),
+    Pair("fi", "fi"),
+    Pair("fil", "fil"),
+    Pair("fr", "fr"),
+    Pair("he", "he"),
+    Pair("hi", "hi"),
+    Pair("hr", "hr"),
+    Pair("hu", "hu"),
+    Pair("id", "id"),
+    Pair("it", "it"),
+    Pair("ja", "ja"),
+    Pair("ko", "ko"),
+    Pair("ku", "ku"),
+    Pair("ml", "ml"),
+    Pair("mn", "mn"),
+    Pair("ms", "ms"),
+    Pair("nl", "nl"),
+    Pair("no", "no"),
+    Pair("pl", "pl"),
+    Pair("pt", "pt"),
+    Pair("pt-BR", "pt_br"),
+    Pair("pt-PT", "pt_pt"),
+    Pair("ro", "ro"),
+    Pair("ru", "ru"),
+    Pair("th", "th"),
+    Pair("tr", "tr"),
+    Pair("uk", "uk"),
+    Pair("vi", "vi"),
+    Pair("xh", "xh"),
+    Pair("zh", "zh"),
+    Pair("zh-rHK", "zh_hk"),
+    Pair("zh-rTW", "zh_tw"),
+    Pair("zu", "zu"),
 )