From 8b86b758417701b58810873e0e4c6d2439efc964 Mon Sep 17 00:00:00 2001
From: Alessandro Jean <alessandrojean@gmail.com>
Date: Mon, 5 Oct 2020 14:53:58 -0300
Subject: [PATCH] Add Projeto Scanlator and Hikari Scan. (#4529)

---
 src/all/madara/build.gradle                               | 2 +-
 .../eu/kanade/tachiyomi/extension/all/madara/Madara.kt    | 4 ++--
 .../tachiyomi/extension/all/madara/MadaraFactory.kt       | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle
index 9d5ed3a7f..e0d44acb4 100644
--- a/src/all/madara/build.gradle
+++ b/src/all/madara/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 138
+    extVersionCode = 139
     libVersion = '1.2'
     containsNsfw = true
 }
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
index 6c214222f..599b0ab34 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
@@ -350,8 +350,8 @@ abstract class Madara(
                 manga.status = when (it.text()) {
                     // I don't know what's the corresponding for COMPLETED and LICENSED
                     // There's no support for "Canceled" or "On Hold"
-                    "Completed", "Completo" -> SManga.COMPLETED
-                    "OnGoing", "Продолжается", "Updating", "Em Lançamento" -> SManga.ONGOING
+                    "Completed", "Completo", "Concluído" -> SManga.COMPLETED
+                    "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em andamento" -> SManga.ONGOING
                     else -> SManga.UNKNOWN
                 }
             }
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
index 31616b64d..18da27d86 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
@@ -169,7 +169,9 @@ class MadaraFactory : SourceFactory {
         OlaoeManga(),
         FdmScan(),
         ArgosScan(),
-        Kombatch()
+        Kombatch(),
+        ProjetoScanlator(),
+        HikariScan()
         // Removed by request of site owner
         // EarlyManga(),
         // MangaGecesi(),
@@ -1301,3 +1303,7 @@ class S2Manga : Madara("S2Manga", "https://s2manga.com", "en")
 class MangaLandArabic : Madara("Manga Land Arabic", "https://mangalandarabic.com", "ar")
 
 class Kombatch : Madara("Kombatch", "https://kombatch.com", "id")
+
+class ProjetoScanlator : Madara("Projeto Scanlator", "https://projetoscanlator.com", "pt-BR", SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")))
+
+class HikariScan : Madara("Hikari Scan", "https://hikariscan.com.br", "pt-BR", SimpleDateFormat("dd 'de' MMMM 'de' yyyy", Locale("pt", "BR")))