From 32ea9344ddf9b6e20ccbb9f5b9b05d695ed2db37 Mon Sep 17 00:00:00 2001 From: RainyXeon Date: Mon, 15 Jul 2024 12:01:16 +0700 Subject: [PATCH] remove: translation for error log --- module/build.gradle.kts | 1 + module/src/customize.sh | 1 + webroot/js/main.js | 16 +++++++++------- webroot/lang/en_US.json | 7 ------- webroot/lang/ja_JP.json | 7 ------- webroot/lang/pt_BR.json | 7 ------- webroot/lang/ro_RO.json | 7 ------- webroot/lang/ru_RU.json | 7 ------- webroot/lang/vi_VN.json | 15 ++++----------- webroot/lang/zh_CN.json | 7 ------- webroot/lang/zh_TW.json | 7 ------- 11 files changed, 15 insertions(+), 67 deletions(-) diff --git a/module/build.gradle.kts b/module/build.gradle.kts index d691002..23a11df 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -170,6 +170,7 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/js/language.js").asFile, null)) set.add(Pair(root.file("webroot/js/restoreError.js").asFile, null)) set.add(Pair(root.file("webroot/js/navbar.js").asFile, null)) + set.add(Pair(root.file("webroot/js/daemon_actions.js").asFile, null)) set.add(Pair(root.file("webroot/js/translate/action.js").asFile, null)) set.add(Pair(root.file("webroot/js/translate/home.js").asFile, null)) diff --git a/module/src/customize.sh b/module/src/customize.sh index 5cb02fb..367818e 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -121,6 +121,7 @@ extract "$ZIPFILE" 'webroot/js/theme.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/language.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/navbar.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/restoreError.js' "$MODPATH/webroot/js" true +extract "$ZIPFILE" 'webroot/js/daemon_actions.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/translate/home.js' "$MODPATH/webroot/js/translate" true extract "$ZIPFILE" 'webroot/js/translate/action.js' "$MODPATH/webroot/js/translate" true diff --git a/webroot/js/main.js b/webroot/js/main.js index 9f2c5c0..10fd3be 100644 --- a/webroot/js/main.js +++ b/webroot/js/main.js @@ -4,7 +4,9 @@ import { setNewLanguage, getTranslations } from './language.js' function setError(place, issue) { toast(`${place}: ${issue}`) - localStorage.setItem('/system/error', `${place}: ${issue}`) + const getPrevious = localStorage.getItem('/system/error') + const finalLog = getPrevious && getPrevious.length !== 0 ? getPrevious + `\n` + `${place}: ${issue}` : `${place}: ${issue}` + localStorage.setItem('/system/error', finalLog) } (async () => { @@ -62,7 +64,7 @@ function setError(place, issue) { zygote64_div.style.display = 'none' daemon64_div.style.display = 'none' } else { - setError('ptrace64', `${translations.cmdErrors.ptrace64} (${ptrace64Cmd.errno}): ${ptrace64Cmd.stderr}`) + setError('ptrace64', `Error while executing zygisk-ptrace64 (${ptrace64Cmd.errno}): ${ptrace64Cmd.stderr}`) zygote64_status = UNEXPECTED_FAIL } @@ -87,7 +89,7 @@ function setError(place, issue) { zygote32_div.style.display = 'none' daemon32_div.style.display = 'none' } else { - setError('ptrace32', `${translations.cmdErrors.ptrace32} (${ptrace32Cmd.errno}): ${ptrace32Cmd.stderr}`) + setError('ptrace32', `Error while executing zygisk-ptrace32 (${ptrace32Cmd.errno}): ${ptrace32Cmd.stderr}`) zygote32_status = UNEXPECTED_FAIL } @@ -121,7 +123,7 @@ function setError(place, issue) { for (const module of modules) { const lsZygiskCmd = await exec(`ls ${module}/zygisk`) if (lsZygiskCmd.errno !== 0) { - setError('ls', `${translations.cmdErrors.ls} ${module} (${lsZygiskCmd.errno}): ${lsZygiskCmd.stderr}`) + setError('ls', `Error while listing files in zygisk folder of module ${module} (${lsZygiskCmd.errno}): ${lsZygiskCmd.stderr}`) continue } @@ -147,13 +149,13 @@ function setError(place, issue) { ` } else { - setError('cat', `${translations.cmdErrors.cat} ${module} (${catCmd.errno}): ${catCmd.stderr}`) + setError('cat', `Error while reading module.prop from module ${module} (${catCmd.errno}): ${catCmd.stderr}`) } } } else { - setError('find', `${translations.cmdErrors.find} (${findModulesCmd.errno}): ${findModulesCmd.stderr}`) + setError('find', `Error while finding zygisk modules (${findModulesCmd.errno}): ${findModulesCmd.stderr}`) } -})().catch((err) => setError('WebUI', err.message)) +})().catch((err) => setError('WebUI', err.stack ? err.stack : err.message)) function setLangData(mode) { localStorage.setItem('/system/language', mode) diff --git a/webroot/lang/en_US.json b/webroot/lang/en_US.json index 82ec1ff..1a41acb 100644 --- a/webroot/lang/en_US.json +++ b/webroot/lang/en_US.json @@ -1,12 +1,5 @@ { "langName": "English (United States)", - "cmdErrors": { - "ptrace64": "Error while executing zygisk-ptrace64", - "ptrace32": "Error while executing zygisk-ptrace32", - "ls": "Error while listing files in zygisk folder of module", - "cat": "Error while reading module.prop from module", - "find": "Error while finding zygisk modules" - }, "global": { "unknown": "Unknown" }, diff --git a/webroot/lang/ja_JP.json b/webroot/lang/ja_JP.json index ffe04f9..2315de8 100644 --- a/webroot/lang/ja_JP.json +++ b/webroot/lang/ja_JP.json @@ -1,12 +1,5 @@ { "langName": "日本語 (日本)", - "cmdErrors": { - "ptrace64": "zygisk-ptrace64を実行している間にエラーが発生しました。", - "ptrace32": "zygisk-ptrace32を実行している間にエラーが発生しました。", - "ls": "zygiskフォルダ内のモジュールをリストする間にエラーが発生しました。", - "cat": "モジュールのmodule.propを読み込んでいる最中にエラーが発生しました。", - "find": "zygiskモジュールを検索している間にエラーが発生しました。" - }, "global": { "unknown": "不明" }, diff --git a/webroot/lang/pt_BR.json b/webroot/lang/pt_BR.json index e0534ac..6275572 100644 --- a/webroot/lang/pt_BR.json +++ b/webroot/lang/pt_BR.json @@ -1,12 +1,5 @@ { "langName": "Português (Brasil)", - "cmdErrors": { - "ptrace64": "Erro ao executar zygisk-ptrace64", - "ptrace32": "Erro ao executar zygisk-ptrace32", - "ls": "Erro ao listar arquivos na pasta zygisk do módulo", - "cat": "Erro ao ler module.prop do módulo", - "find": "Erro ao encontrar módulos que usam o zygisk" - }, "global": { "unknown": "Desconhecido" }, diff --git a/webroot/lang/ro_RO.json b/webroot/lang/ro_RO.json index 39df458..f381ce0 100644 --- a/webroot/lang/ro_RO.json +++ b/webroot/lang/ro_RO.json @@ -1,12 +1,5 @@ { "langName": "Română (România)", - "cmdErrors": { - "ptrace64": "Eroare în timpul executării zygisk-ptrace64", - "ptrace32": "Eroare în timpul executării zygisk-ptrace32", - "ls": "Eroare în timpul listării fișierelor din folderul Zygisk al modulului", - "cat": "Eroare în timpul citirii fișierului module.prop din modul", - "find": "Eroare la găsirea modulelor Zygisk" - }, "global": { "unknown": "Necunoscut" }, diff --git a/webroot/lang/ru_RU.json b/webroot/lang/ru_RU.json index 5fb2b16..054e952 100644 --- a/webroot/lang/ru_RU.json +++ b/webroot/lang/ru_RU.json @@ -1,12 +1,5 @@ { "langName": "Русский (Россия)", - "cmdErrors": { - "ptrace64": "Ошибка выполнения zygisk-ptrace64", - "ptrace32": "Ошибка выполнения zygisk-ptrace32", - "ls": "Ошибка перечисления файлов в zygisk папке модуля", - "cat": "Ошибка чтения module.prop модуля", - "find": "Ошибка обнаружения zygisk модулей" - }, "global": { "unknown": "Неизвестно" }, diff --git a/webroot/lang/vi_VN.json b/webroot/lang/vi_VN.json index 1a1adff..fa9e8b9 100644 --- a/webroot/lang/vi_VN.json +++ b/webroot/lang/vi_VN.json @@ -1,12 +1,5 @@ { "langName": "Tiếng Việt", - "cmdErrors": { - "ptrace64": "Đã xảy ra lỗi khi chạy zygisk-ptrace64", - "ptrace32": "Đã xảy ra lỗi khi chạy zygisk-ptrace32", - "ls": "Đã xảy ra lỗi khi liệt kê tệp tin của mô đun trong thư mục zygisk", - "cat": "Đã xảy ra lỗi khi đọc tệp tin module.prop từ mô đun", - "find": "Đã xảy ra lỗi khi tìm mô đun thuộc zygisk" - }, "global": { "unknown": "Không xác định" }, @@ -23,10 +16,10 @@ "home": { "header": "Trang Chủ", "status": { - "unknown": "ReZygisk đang ở trạng thái không xác định!", - "notWorking": "ReZygisk không hoạt động!", - "ok": "ReZygisk đang hoạt động!", - "partially": "ReZygisk đang hoạt động một phần!" + "unknown": "Không xác định", + "notWorking": "Không hoạt động", + "ok": "Đang hoạt động", + "partially": "Đang hoạt động một phần" }, "info": { "version": "Phiên bản", diff --git a/webroot/lang/zh_CN.json b/webroot/lang/zh_CN.json index dce3cdc..9fd8ee1 100644 --- a/webroot/lang/zh_CN.json +++ b/webroot/lang/zh_CN.json @@ -1,12 +1,5 @@ { "langName": "简体中文 (中国)", - "cmdErrors": { - "ptrace64": "执行zygisk-ptrace64时出现错误", - "ptrace32": "执行zygisk-ptrace32时出现错误", - "ls": "列出模块zygisk文件夹中的文件时出现错误", - "cat": "读取模块module.prop时出现错误", - "find": "查找zygisk模块时出现错误" - }, "global": { "unknown": "未知" }, diff --git a/webroot/lang/zh_TW.json b/webroot/lang/zh_TW.json index c2fcee4..d18de54 100644 --- a/webroot/lang/zh_TW.json +++ b/webroot/lang/zh_TW.json @@ -1,12 +1,5 @@ { "langName": "繁體中文 (中國台灣)", - "cmdErrors": { - "ptrace64": "執行zygisk-ptrace64時發生錯誤", - "ptrace32": "執行zygisk-ptrace32時發生錯誤", - "ls": "列出模組zygisk文件夾中的文件時出現錯誤", - "cat": "讀取模組module.prop時出現錯誤", - "find": "查找zygisk模塊時出現錯誤" - }, "global": { "unknown": "未知" },