From e40e11654edbe4dd7d53fb51b9691f135c04eaf0 Mon Sep 17 00:00:00 2001 From: KietNT <113796420+TanNhatCMS@users.noreply.github.com> Date: Sat, 28 Feb 2026 05:29:43 +0700 Subject: [PATCH 1/2] Use vue-i18n useI18n/t and add Erlang i18n Replace legacy I18nT usage with vue-i18n composition API (useI18n and t()) across numerous Vue components (App, Conf drawer, Deno, Erlang, MySQL modules, Podman, etc.). Add 'projectErlang' translation key to many locale host.json files and minor Vietnamese i18n additions. Remove legacy: true from createI18n call. Also add helper-go/go.sum and Windows resource binaries (rsrc_windows_386/amd64.syso). --- src/lang/en/host.json | 3 +- src/lang/es/host.json | 1 + src/lang/fi/host.json | 1 + src/lang/fr/host.json | 1 + src/lang/id/host.json | 7 +- src/lang/index.ts | 1 - src/lang/it/host.json | 7 +- src/lang/ja/host.json | 7 +- src/lang/nl/host.json | 1 + src/lang/no/host.json | 1 + src/lang/pl/host.json | 1 + src/lang/pt-br/host.json | 1 + src/lang/pt/host.json | 1 + src/lang/ro/host.json | 1 + src/lang/ru/host.json | 1 + src/lang/sv/host.json | 7 +- src/lang/tr/host.json | 1 + src/lang/uk/host.json | 1 + src/lang/vi/host.json | 6 +- src/lang/zh/host.json | 1 + src/render/App.vue | 11 +- src/render/components/Conf/drawer.vue | 19 +-- src/render/components/Deno/Index.vue | 7 +- src/render/components/Erlang/Index.vue | 2 +- src/render/components/Mysql/Config.vue | 28 ++-- src/render/components/Mysql/Group/Add.vue | 18 +-- src/render/components/Mysql/Group/Config.vue | 30 ++-- src/render/components/Mysql/Group/Index.vue | 4 +- src/render/components/Mysql/Group/Logs.vue | 8 +- .../components/Mysql/Group/SetupPopper.vue | 22 +-- src/render/components/Mysql/Index.vue | 18 +-- .../components/Mysql/Manage/addDatabase.vue | 57 ++++---- .../components/Mysql/Manage/database.vue | 40 +++--- src/render/components/Mysql/Manage/index.vue | 13 +- .../components/Mysql/Manage/setBackupDir.vue | 6 +- .../components/Mysql/Manage/setPassword.vue | 32 +++-- src/render/components/Nginx/Config.vue | 21 +-- src/render/components/Nginx/Index.vue | 13 +- src/render/components/Nodejs/Config.vue | 7 +- src/render/components/Nodejs/Index.vue | 12 +- src/render/components/Nodejs/List.vue | 8 +- .../components/Nodejs/default/index.vue | 23 +-- src/render/components/Nodejs/fnm/index.vue | 35 +++-- src/render/components/Nodejs/nvm/index.vue | 37 ++--- .../Nodejs/projects/dependencies/index.vue | 9 +- src/render/components/Ollama/Index.vue | 13 +- .../components/Ollama/models/all/index.vue | 18 +-- src/render/components/Ollama/models/index.vue | 14 +- .../components/Ollama/models/local/index.vue | 10 +- src/render/components/PHP/Config.vue | 33 ++--- src/render/components/PHP/DisableFunction.vue | 58 ++++---- src/render/components/PHP/ErrorLog.vue | 5 +- src/render/components/PHP/Extends.vue | 23 +-- .../PHP/Extension/Homebrew/index.vue | 30 ++-- .../components/PHP/Extension/Lib/index.vue | 9 +- .../components/PHP/Extension/Loaded/index.vue | 11 +- .../components/PHP/Extension/Local/index.vue | 9 +- .../PHP/Extension/Macports/index.vue | 30 ++-- src/render/components/PHP/List.vue | 45 +++--- src/render/components/PHP/Logs.vue | 5 +- src/render/components/PHP/aside.vue | 5 +- src/render/components/Perl/Index.vue | 7 +- src/render/components/Podman/Index.vue | 15 +- .../components/Podman/compose-build/Base.vue | 18 +-- .../components/Podman/compose-build/Bun.vue | 5 +- .../Podman/compose-build/Consul.vue | 5 +- .../components/Podman/compose-build/Deno.vue | 5 +- .../Podman/compose-build/Elasticsearch.vue | 5 +- .../Podman/compose-build/Erlang.vue | 5 +- .../components/Podman/compose-build/Etcd.vue | 5 +- .../components/Podman/compose-build/Go.vue | 5 +- .../components/Podman/compose-build/Java.vue | 5 +- .../Podman/compose-build/MariaDB.vue | 13 +- .../Podman/compose-build/Meilisearch.vue | 5 +- .../components/Podman/compose-build/MinIO.vue | 5 +- .../Podman/compose-build/MongoDB.vue | 5 +- .../components/Podman/compose-build/MySQL.vue | 13 +- .../Podman/compose-build/NodeJS.vue | 5 +- .../components/Podman/compose-build/Perl.vue | 5 +- .../Podman/compose-build/PostgreSQL.vue | 5 +- .../Podman/compose-build/Python.vue | 5 +- .../Podman/compose-build/RabbitMQ.vue | 5 +- .../components/Podman/compose-build/Redis.vue | 5 +- .../components/Podman/compose-build/Ruby.vue | 5 +- .../components/Podman/compose-build/Rust.vue | 5 +- .../Podman/compose-build/components/base.vue | 15 +- .../compose-build/components/docRoot.vue | 5 +- .../compose-build/components/preview.vue | 9 +- .../compose-build/components/wwwRoot.vue | 5 +- .../components/Podman/compose/compose.vue | 35 ++--- .../components/Podman/compose/composeAdd.vue | 33 +++-- .../Podman/compose/composeBuild.vue | 15 +- .../components/Podman/container/container.vue | 33 ++--- .../Podman/container/containerCreate.vue | 88 +++++------- .../components/Podman/container/info.vue | 131 +++++++++--------- .../components/Podman/container/preview.vue | 11 +- src/render/components/Podman/dashboard.vue | 75 +++++----- src/render/components/Podman/image/image.vue | 34 ++--- .../components/Podman/image/imageAdd.vue | 31 +++-- src/render/components/Podman/left.vue | 13 +- .../components/Podman/machine/machineAdd.vue | 39 +++--- src/render/components/Podman/right.vue | 14 +- src/render/components/PostgreSql/Index.vue | 14 +- src/render/tray/App.vue | 7 +- 104 files changed, 848 insertions(+), 769 deletions(-) diff --git a/src/lang/en/host.json b/src/lang/en/host.json index c72ba7364..c1fb259b3 100644 --- a/src/lang/en/host.json +++ b/src/lang/en/host.json @@ -25,7 +25,6 @@ "noPhpWarning": "Check that no PHP version is selected, a static site will be created, and the PHP files will cannot be executed. Are you sure to continue?", "hostsWriteTips": "Enable / Disable all hosts in this list", "sort": "Sort", - "projectPhp": "PHP Projects", "projectJava": "Java Projects", "projectNode": "Node Projects", @@ -35,7 +34,7 @@ "projectDeno": "Deno Projects", "projectBun": "Bun Projects", "projectPerl": "Perl Projects", - + "projectErlang": "Erlang Projects", "jarPackagePath": "JAR Package Path", "jdkPath": "JDK Path", "pythonPath": "Python Path", diff --git a/src/lang/es/host.json b/src/lang/es/host.json index b55ce804a..002f100fd 100644 --- a/src/lang/es/host.json +++ b/src/lang/es/host.json @@ -34,6 +34,7 @@ "projectDeno": "Proyectos Deno", "projectBun": "Proyectos Bun", "projectPerl": "Proyectos Perl", + "projectErlang": "Proyectos Erlang", "jarPackagePath": "Ruta del paquete JAR", "jdkPath": "Ruta de JDK", "pythonPath": "Ruta de Python", diff --git a/src/lang/fi/host.json b/src/lang/fi/host.json index 77ad5054c..17ae7d226 100644 --- a/src/lang/fi/host.json +++ b/src/lang/fi/host.json @@ -34,6 +34,7 @@ "projectDeno": "Deno Projektit", "projectBun": "Suorita Projektit", "projectPerl": "Perl Projektit", + "projectErlang": "Erlang Projektit", "jarPackagePath": "Jar Paketin Polku", "jdkPath": "Jdk Polku", "pythonPath": "Python Path", diff --git a/src/lang/fr/host.json b/src/lang/fr/host.json index 59aa7f375..58876b722 100644 --- a/src/lang/fr/host.json +++ b/src/lang/fr/host.json @@ -34,6 +34,7 @@ "projectDeno": "Projets Deno", "projectBun": "Projets Bun", "projectPerl": "Projets Perl", + "projectErlang": "Projets Erlang", "jarPackagePath": "Chemin du package JAR", "jdkPath": "Chemin JDK", "pythonPath": "Chemin Python", diff --git a/src/lang/id/host.json b/src/lang/id/host.json index d716f2497..cf2fab364 100644 --- a/src/lang/id/host.json +++ b/src/lang/id/host.json @@ -31,9 +31,10 @@ "projectGo": "Proyek Go", "projectPython": "Proyek Python", "projectTomcat": "Proyek Tomcat", - "projectDeno": "Deno Projects", - "projectBun": "Bun Projects", - "projectPerl": "Perl Projects", + "projectDeno": "Proyek Deno", + "projectBun": "Proyek Bun", + "projectPerl": "Proyek Perl", + "projectErlang": "Proyek Erlang", "jarPackagePath": "Path Paket JAR", "jdkPath": "Path JDK", "pythonPath": "Path Python", diff --git a/src/lang/index.ts b/src/lang/index.ts index 75511b5d1..30a5ca84e 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -169,7 +169,6 @@ let i18n: I18n export const AppI18n = (l?: string): I18n => { if (!i18n) { i18n = createI18n({ - legacy: true, locale: l || 'en', fallbackLocale: 'en', messages: lang as any diff --git a/src/lang/it/host.json b/src/lang/it/host.json index d3eeaa902..2c28344ff 100644 --- a/src/lang/it/host.json +++ b/src/lang/it/host.json @@ -31,9 +31,10 @@ "projectGo": "Progetti Go", "projectPython": "Progetti Python", "projectTomcat": "Progetti Tomcat", - "projectDeno": "Deno Projects", - "projectBun": "Bun Projects", - "projectPerl": "Perl Projects", + "projectDeno": "Progetti Deno", + "projectBun": "Progetti Bun", + "projectPerl": "Progetti Perl", + "projectErlang": "Progetti Erlang", "jarPackagePath": "Percorso pacchetto JAR", "jdkPath": "Percorso JDK", "pythonPath": "Percorso Python", diff --git a/src/lang/ja/host.json b/src/lang/ja/host.json index 15d584a6f..47a8f9971 100644 --- a/src/lang/ja/host.json +++ b/src/lang/ja/host.json @@ -31,9 +31,10 @@ "projectGo": "Goプロジェクト", "projectPython": "Pythonプロジェクト", "projectTomcat": "Tomcatプロジェクト", - "projectDeno": "Deno Projects", - "projectBun": "Bun Projects", - "projectPerl": "Perl Projects", + "projectDeno": "Denoプロジェクト", + "projectBun": "Bunプロジェクト", + "projectPerl": "Perlプロジェクト", + "projectErlang": "Erlangプロジェクト", "jarPackagePath": "JARパッケージパス", "jdkPath": "JDKパス", "pythonPath": "Pythonパス", diff --git a/src/lang/nl/host.json b/src/lang/nl/host.json index 5e9d71532..db82b2ae4 100644 --- a/src/lang/nl/host.json +++ b/src/lang/nl/host.json @@ -34,6 +34,7 @@ "projectDeno": "Deno Projecten", "projectBun": "Bun Projecten", "projectPerl": "Projecten Perl", + "projectErlang": "Erlang Projecten", "jarPackagePath": "JAR pakketpad", "jdkPath": "JDK Pad", "pythonPath": "Python Path", diff --git a/src/lang/no/host.json b/src/lang/no/host.json index 99176e751..4bd9b0904 100644 --- a/src/lang/no/host.json +++ b/src/lang/no/host.json @@ -34,6 +34,7 @@ "projectDeno": "Deno prosjekter", "projectBun": "Bun Prosjekter", "projectPerl": "Perl prosjekter", + "projectErlang": "Erlang prosjekter", "jarPackagePath": "JAR pakkebane", "jdkPath": "JDK sti", "pythonPath": "Python Path", diff --git a/src/lang/pl/host.json b/src/lang/pl/host.json index e2f62cf03..ed4282d0d 100644 --- a/src/lang/pl/host.json +++ b/src/lang/pl/host.json @@ -34,6 +34,7 @@ "projectDeno": "Projekty Deno", "projectBun": "Projekty Bun", "projectPerl": "Projekty Perl", + "projectErlang": "Projekty Erlang", "jarPackagePath": "Ścieżka pakietu JAR", "jdkPath": "Ścieżka JDK", "pythonPath": "Python Path", diff --git a/src/lang/pt-br/host.json b/src/lang/pt-br/host.json index 3dffc63a0..4f49b1801 100644 --- a/src/lang/pt-br/host.json +++ b/src/lang/pt-br/host.json @@ -34,6 +34,7 @@ "projectDeno": "Projeto Deno", "projectBun": "Projeto Bun", "projectPerl": "Projeto Perl", + "projectErlang": "Projeto Erlang", "jarPackagePath": "Caminho do pacote jar", "jdkPath": "Caminho do JDK", "pythonPath": "Caminho do Python", diff --git a/src/lang/pt/host.json b/src/lang/pt/host.json index 4f08469aa..1c8e739df 100644 --- a/src/lang/pt/host.json +++ b/src/lang/pt/host.json @@ -34,6 +34,7 @@ "projectDeno": "Projeto Deno", "projectBun": "Projeto Bun", "projectPerl": "Projeto Perl", + "projectErlang": "Projeto Erlang", "jarPackagePath": "Caminho do pacote jar", "jdkPath": "Caminho do JDK", "pythonPath": "Caminho do Python", diff --git a/src/lang/ro/host.json b/src/lang/ro/host.json index 14fbb33ee..7dca5427e 100644 --- a/src/lang/ro/host.json +++ b/src/lang/ro/host.json @@ -34,6 +34,7 @@ "projectDeno": "Proiecte Deno", "projectBun": "Proiecte de Bun", "projectPerl": "Proiecte Perl", + "projectErlang": "Proiecte Erlang", "jarPackagePath": "Calea JAR a pachetului", "jdkPath": "Cale JDK", "pythonPath": "Python Path", diff --git a/src/lang/ru/host.json b/src/lang/ru/host.json index 695b738d8..b0dce5502 100644 --- a/src/lang/ru/host.json +++ b/src/lang/ru/host.json @@ -34,6 +34,7 @@ "projectDeno": "Проекты Deno", "projectBun": "Bun Проекты", "projectPerl": "Проекты Perl", + "projectErlang": "Проекты Erlang", "jarPackagePath": "Путь к пакету JAR", "jdkPath": "Путь JDK", "pythonPath": "Python Path", diff --git a/src/lang/sv/host.json b/src/lang/sv/host.json index 5246af414..5388c1341 100644 --- a/src/lang/sv/host.json +++ b/src/lang/sv/host.json @@ -31,9 +31,10 @@ "projectGo": "Go-projekt", "projectPython": "Python-projekt", "projectTomcat": "Tomcat-projekt", - "projectDeno": "Deno Projects", - "projectBun": "Bun Projects", - "projectPerl": "Perl Projects", + "projectDeno": "Deno-projekt", + "projectBun": "Bun-projekt", + "projectPerl": "Perl-projekt", + "projectErlang": "Erlang-projekt", "jarPackagePath": "JAR-paket sökväg", "jdkPath": "JDK-sökväg", "pythonPath": "Python-sökväg", diff --git a/src/lang/tr/host.json b/src/lang/tr/host.json index b2f9243c9..870962139 100644 --- a/src/lang/tr/host.json +++ b/src/lang/tr/host.json @@ -34,6 +34,7 @@ "projectDeno": "Deno Projeleri", "projectBun": "Bun Projeleri", "projectPerl": "Perl Projeleri", + "projectErlang": "Erlang Projeleri", "jarPackagePath": "JAR Paket Yolu", "jdkPath": "JDK Yolu", "pythonPath": "Python Yolu", diff --git a/src/lang/uk/host.json b/src/lang/uk/host.json index a3d190f0f..359b94750 100644 --- a/src/lang/uk/host.json +++ b/src/lang/uk/host.json @@ -34,6 +34,7 @@ "projectDeno": "Проекти Deno", "projectBun": "Проекти Bun", "projectPerl": "Проекти Perl", + "projectErlang": "Проекти Erlang", "jarPackagePath": "Шлях до пакета JAR", "jdkPath": "Шлях JDK", "pythonPath": "Шлях Python", diff --git a/src/lang/vi/host.json b/src/lang/vi/host.json index 819b89659..ee479ab0c 100644 --- a/src/lang/vi/host.json +++ b/src/lang/vi/host.json @@ -34,6 +34,7 @@ "projectDeno": "Dự án Deno", "projectBun": "Dự án Bun", "projectPerl": "Dự án Perl", + "projectErlang": "Dự án Erlang", "jarPackagePath": "Đường dẫn gói JAR", "jdkPath": "Đường dẫn JDK", "pythonPath": "Đường dẫn Python", @@ -67,5 +68,8 @@ "copyCommand": "Sao chép lệnh", "showFile": "Hiển thị tệp", "sticky": "Ghim", - "dbclickRowToEdit": "Nhấp đúp vào dòng này để chỉnh sửa" + "dbclickRowToEdit": "Nhấp đúp vào dòng này để chỉnh sửa", + + "OnlineDomain": "Tên miền trực tuyến", + "LocalDoman": "Tên miền Local" } diff --git a/src/lang/zh/host.json b/src/lang/zh/host.json index 12eb37f36..808f1bebc 100644 --- a/src/lang/zh/host.json +++ b/src/lang/zh/host.json @@ -34,6 +34,7 @@ "projectDeno": "Deno项目", "projectBun": "Bun项目", "projectPerl": "Perl项目", + "projectErlang": "Erlang项目", "jarPackagePath": "jar包路径", "jdkPath": "jdk路径", "pythonPath": "Python路径", diff --git a/src/render/App.vue b/src/render/App.vue index 7c3f02e51..59e6d0e97 100644 --- a/src/render/App.vue +++ b/src/render/App.vue @@ -11,7 +11,7 @@ import IPC from '@/util/IPC' import { AppStore } from '@/store/app' import { BrewStore } from '@/store/brew' - import { I18nT } from '@lang/index' + import { useI18n } from 'vue-i18n' import Base from '@/core/Base' import { MessageSuccess } from '@/util/Element' import FloatButton from '@/components/FloatBtn/index.vue' @@ -22,6 +22,7 @@ import { nativeTheme, shell } from '@/util/NodeFn' import localForage from 'localforage' + const { t } = useI18n() const appStore = AppStore() const brewStore = BrewStore() @@ -73,7 +74,7 @@ const showAbout = () => { Base.Dialog(import('./components/About/index.vue')) .className('about-dialog') - .title(I18nT('base.about')) + .title(t('base.about')) .width('665px') .noFooter() .show() @@ -144,7 +145,7 @@ console.log('sysetmProxy: ', res) const proxy = res?.data ?? {} if (Object.keys(proxy).length > 0) { - Base._Confirm(I18nT('tools.systemProxyCheck'), undefined, { + Base._Confirm(t('tools.systemProxyCheck'), undefined, { customClass: 'confirm-del', type: 'warning' }).then(() => { @@ -155,7 +156,7 @@ appStore.config.setup.proxy.on = true appStore.config.setup.proxy.proxy = arr.join(' ') appStore.saveConfig() - MessageSuccess(I18nT('tools.systemProxyUsed')) + MessageSuccess(t('tools.systemProxyUsed')) }) localStorage.setItem('FlyEnv-Checked-Proxy', 'true') } @@ -198,7 +199,7 @@ onMounted(() => { init() - brewStore.cardHeadTitle = I18nT('base.currentVersionLib') + brewStore.cardHeadTitle = t('base.currentVersionLib') }) onUnmounted(() => { diff --git a/src/render/components/Conf/drawer.vue b/src/render/components/Conf/drawer.vue index a7cc595f7..2ef342135 100644 --- a/src/render/components/Conf/drawer.vue +++ b/src/render/components/Conf/drawer.vue @@ -9,24 +9,24 @@