From 57788709630f195b07d508c175e16fbbfbef2615 Mon Sep 17 00:00:00 2001
From: RainyXeon <xeondev@xeondex.onmicrosoft.com>
Date: Sat, 6 Jul 2024 12:11:23 +0700
Subject: [PATCH] fix: corrupted zip file in webui

---
 module/build.gradle.kts                      | 10 +++++-----
 module/src/customize.sh                      | 10 +++++-----
 webroot/js/language.js                       |  2 +-
 webroot/lang/{en_US/main.json => en_US.json} |  0
 webroot/lang/{pt_BR/main.json => pt_BR.json} |  0
 webroot/lang/{ro_RO/main.json => ro_RO.json} |  0
 webroot/lang/{ru_RU/main.json => ru_RU.json} |  0
 webroot/lang/{vi_VN/main.json => vi_VN.json} |  0
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename webroot/lang/{en_US/main.json => en_US.json} (100%)
 rename webroot/lang/{pt_BR/main.json => pt_BR.json} (100%)
 rename webroot/lang/{ro_RO/main.json => ro_RO.json} (100%)
 rename webroot/lang/{ru_RU/main.json => ru_RU.json} (100%)
 rename webroot/lang/{vi_VN/main.json => vi_VN.json} (100%)

diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index 650b10f..b5cfda4 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -173,11 +173,11 @@ androidComponents.onVariants { variant ->
                     set.add(Pair(root.file("webroot/js/list/settings.js").asFile, null))
                     set.add(Pair(root.file("webroot/js/list/language.js").asFile, null))
 
-                    set.add(Pair(root.file("webroot/lang/en_US/main.json").asFile, null))
-                    set.add(Pair(root.file("webroot/lang/pt_BR/main.json").asFile, null))
-                    set.add(Pair(root.file("webroot/lang/ro_RO/main.json").asFile, null))
-                    set.add(Pair(root.file("webroot/lang/ru_RU/main.json").asFile, null))
-                    set.add(Pair(root.file("webroot/lang/vi_VN/main.json").asFile, null))
+                    set.add(Pair(root.file("webroot/lang/en_US.json").asFile, null))
+                    set.add(Pair(root.file("webroot/lang/pt_BR.json").asFile, null))
+                    set.add(Pair(root.file("webroot/lang/ro_RO.json").asFile, null))
+                    set.add(Pair(root.file("webroot/lang/ru_RU.json").asFile, null))
+                    set.add(Pair(root.file("webroot/lang/vi_VN.json").asFile, null))
 
                     set.add(Pair(root.file("webroot/js/modal/language.js").asFile, null))
 
diff --git a/module/src/customize.sh b/module/src/customize.sh
index 8639e47..051fa9d 100644
--- a/module/src/customize.sh
+++ b/module/src/customize.sh
@@ -124,11 +124,11 @@ extract "$ZIPFILE" 'webroot/js/list/module.js' "$MODPATH/webroot/js/list" true
 extract "$ZIPFILE" 'webroot/js/list/settings.js' "$MODPATH/webroot/js/list" true
 extract "$ZIPFILE" 'webroot/js/list/language.js' "$MODPATH/webroot/js/list" true
 
-extract "$ZIPFILE" 'webroot/lang/en_US/main.json' "$MODPATH/webroot/lang/en_US" true
-extract "$ZIPFILE" 'webroot/lang/pt_BR/main.json' "$MODPATH/webroot/lang/pt_BR" true
-extract "$ZIPFILE" 'webroot/lang/ro_RO/main.json' "$MODPATH/webroot/lang/ro_RO" true
-extract "$ZIPFILE" 'webroot/lang/ru_RU/main.json' "$MODPATH/webroot/lang/ru_RU" true
-extract "$ZIPFILE" 'webroot/lang/vi_VN/main.json' "$MODPATH/webroot/lang/vi_VN" true
+extract "$ZIPFILE" 'webroot/lang/en_US.json' "$MODPATH/webroot/lang" true
+extract "$ZIPFILE" 'webroot/lang/pt_BR.json' "$MODPATH/webroot/lang" true
+extract "$ZIPFILE" 'webroot/lang/ro_RO.json' "$MODPATH/webroot/lang" true
+extract "$ZIPFILE" 'webroot/lang/ru_RU.json' "$MODPATH/webroot/lang" true
+extract "$ZIPFILE" 'webroot/lang/vi_VN.json' "$MODPATH/webroot/lang" true
 
 extract "$ZIPFILE" 'webroot/js/modal/language.js' "$MODPATH/webroot/js/modal" true
 
diff --git a/webroot/js/language.js b/webroot/js/language.js
index 860e610..5825eb0 100644
--- a/webroot/js/language.js
+++ b/webroot/js/language.js
@@ -125,7 +125,7 @@ export async function setNewLanguage(locate, initialize) {
 }
 
 export async function getTranslations(locate) {
-  const translateData = await fetch(`./lang/${locate}/main.json`)
+  const translateData = await fetch(`./${locate}/main.json`)
     .catch(error => reject(error))
   return await translateData.json()
 }
diff --git a/webroot/lang/en_US/main.json b/webroot/lang/en_US.json
similarity index 100%
rename from webroot/lang/en_US/main.json
rename to webroot/lang/en_US.json
diff --git a/webroot/lang/pt_BR/main.json b/webroot/lang/pt_BR.json
similarity index 100%
rename from webroot/lang/pt_BR/main.json
rename to webroot/lang/pt_BR.json
diff --git a/webroot/lang/ro_RO/main.json b/webroot/lang/ro_RO.json
similarity index 100%
rename from webroot/lang/ro_RO/main.json
rename to webroot/lang/ro_RO.json
diff --git a/webroot/lang/ru_RU/main.json b/webroot/lang/ru_RU.json
similarity index 100%
rename from webroot/lang/ru_RU/main.json
rename to webroot/lang/ru_RU.json
diff --git a/webroot/lang/vi_VN/main.json b/webroot/lang/vi_VN.json
similarity index 100%
rename from webroot/lang/vi_VN/main.json
rename to webroot/lang/vi_VN.json