From 53b7ee4e9e0632152bf96ea3991648dfed914d0d Mon Sep 17 00:00:00 2001
From: "GL.iNet-Yongping.Xie" <yongping.xie@gl-inet.com>
Date: Wed, 22 Apr 2026 21:00:20 -0700
Subject: [PATCH] fix: render modal Confirm/Cancel buttons in all locales

Route button labels through the project's vue-i18n; the upstream
fallback only knew en/zh and crashed the footer in de/es/fr/ja/ko.

Signed-off-by: GL.iNet-Yongping.Xie <yongping.xie@gl-inet.com>
---
 internal/server/version.go                    |  2 +-
 ui/src/components/base/baseModalI18n.vue      | 31 +++++++++++++++++++
 ui/src/lang/locales/de.json                   |  1 +
 ui/src/lang/locales/en.json                   |  1 +
 ui/src/lang/locales/es.json                   |  1 +
 ui/src/lang/locales/fr.json                   |  1 +
 ui/src/lang/locales/ja.json                   |  1 +
 ui/src/lang/locales/ko.json                   |  1 +
 ui/src/lang/locales/zh.json                   |  1 +
 .../components/accessDeviceWebDialog.vue      |  2 +-
 .../device/components/addDeviceDialog.vue     |  7 +++--
 .../components/addDeviceGroupSimpleDialog.vue |  2 +-
 .../device/components/cmdResDetailDialog.vue  |  2 +-
 .../components/commandResponseDialog.vue      |  2 +-
 .../components/editDescriptionDialog.vue      |  2 +-
 .../components/executeCommandDialog.vue       |  2 +-
 .../components/moveToDeviceGroupDialog.vue    |  3 +-
 ui/src/views/device/components/rttyTerm.vue   |  2 +-
 .../components/addDeviceGroupDialog.vue       |  3 +-
 .../addDeviceToDeviceGroupDialog.vue          |  3 +-
 .../components/editDeviceGroupInfoDialog.vue  |  2 +-
 .../components/manageDevicesDialog.vue        |  3 +-
 .../components/disable2faDialog.vue           |  2 +-
 .../components/editProfileDialog.vue          |  2 +-
 .../components/enable2faDialog.vue            |  2 +-
 .../userManage/components/addUserDialog.vue   |  2 +-
 .../components/addUserGroupDialog.vue         |  2 +-
 .../components/associateDeviceGroupDialog.vue |  3 +-
 .../userManage/components/editUserDialog.vue  |  2 +-
 .../components/editUserGroupDialog.vue        |  2 +-
 30 files changed, 68 insertions(+), 24 deletions(-)
 create mode 100644 ui/src/components/base/baseModalI18n.vue

diff --git a/internal/server/version.go b/internal/server/version.go
index b3633d7..4e73407 100755
--- a/internal/server/version.go
+++ b/internal/server/version.go
@@ -1,7 +1,7 @@
 package server
 
 const RttysVersion = "5.2.0"
-const KVMCloudVersion = "v2.5.0"
+const KVMCloudVersion = "v2.6.0"
 
 var (
 	GitCommit = ""
diff --git a/ui/src/components/base/baseModalI18n.vue b/ui/src/components/base/baseModalI18n.vue
new file mode 100644
index 0000000..b9e7d9b
--- /dev/null
+++ b/ui/src/components/base/baseModalI18n.vue
@@ -0,0 +1,31 @@
+<!--
+ * @Description: Wraps gl-web-main's BaseModal with project-i18n defaults for
+ *   okText / cancelText. The upstream BaseModal falls back to its own internal
+ *   i18n table when these props are omitted, but that table only contains
+ *   zh/en — any other locale throws at render time and the entire footer slot
+ *   fails to mount, so Confirm/Cancel buttons disappear in de/es/fr/ja/ko.
+ *   Defaulting the props here routes labels through the project's vue-i18n,
+ *   which knows every supported locale.
+-->
+<template>
+    <BaseModal
+        :cancelText="cancelText"
+        :okText="okText"
+    >
+        <template v-for="(_, name) in $slots" #[name]="slotData">
+            <slot :name="name" v-bind="slotData || {}" />
+        </template>
+    </BaseModal>
+</template>
+
+<script setup lang="ts">
+import { BaseModal } from 'gl-web-main/components'
+
+withDefaults(defineProps<{
+    okText?: string
+    cancelText?: string
+}>(), {
+    okText: 'common.confirm',
+    cancelText: 'common.cancel',
+})
+</script>
diff --git a/ui/src/lang/locales/de.json b/ui/src/lang/locales/de.json
index 3ab9048..6a75ac4 100644
--- a/ui/src/lang/locales/de.json
+++ b/ui/src/lang/locales/de.json
@@ -12,6 +12,7 @@
     "success": "Erfolgreich",
     "failed": "Fehlgeschlagen",
     "cancel": "Abbrechen",
+    "confirm": "Bestätigen",
     "ok": "OK",
     "close": "Schließen",
     "about": "Über",
diff --git a/ui/src/lang/locales/en.json b/ui/src/lang/locales/en.json
index 79651c5..737252b 100644
--- a/ui/src/lang/locales/en.json
+++ b/ui/src/lang/locales/en.json
@@ -12,6 +12,7 @@
     "success": "Success",
     "failed": "Failed",
     "cancel": "Cancel",
+    "confirm": "Confirm",
     "ok": "OK",
     "close": "Close",
     "about": "About",
diff --git a/ui/src/lang/locales/es.json b/ui/src/lang/locales/es.json
index f0a7797..7709817 100644
--- a/ui/src/lang/locales/es.json
+++ b/ui/src/lang/locales/es.json
@@ -12,6 +12,7 @@
     "success": "Éxito",
     "failed": "Error",
     "cancel": "Cancelar",
+    "confirm": "Confirmar",
     "ok": "Aceptar",
     "close": "Cerrar",
     "about": "Acerca de",
diff --git a/ui/src/lang/locales/fr.json b/ui/src/lang/locales/fr.json
index a06f095..5903e4d 100644
--- a/ui/src/lang/locales/fr.json
+++ b/ui/src/lang/locales/fr.json
@@ -12,6 +12,7 @@
     "success": "Succès",
     "failed": "Échec",
     "cancel": "Annuler",
+    "confirm": "Confirmer",
     "ok": "OK",
     "close": "Fermer",
     "about": "À propos",
diff --git a/ui/src/lang/locales/ja.json b/ui/src/lang/locales/ja.json
index bf5b43c..9ddeb2a 100644
--- a/ui/src/lang/locales/ja.json
+++ b/ui/src/lang/locales/ja.json
@@ -12,6 +12,7 @@
     "success": "成功",
     "failed": "失敗",
     "cancel": "キャンセル",
+    "confirm": "確認",
     "ok": "OK",
     "close": "閉じる",
     "about": "このサービスについて",
diff --git a/ui/src/lang/locales/ko.json b/ui/src/lang/locales/ko.json
index cdd2a2d..21b962f 100644
--- a/ui/src/lang/locales/ko.json
+++ b/ui/src/lang/locales/ko.json
@@ -12,6 +12,7 @@
     "success": "성공",
     "failed": "실패",
     "cancel": "취소",
+    "confirm": "확인",
     "ok": "확인",
     "close": "닫기",
     "about": "정보",
diff --git a/ui/src/lang/locales/zh.json b/ui/src/lang/locales/zh.json
index 4747327..bcfac93 100644
--- a/ui/src/lang/locales/zh.json
+++ b/ui/src/lang/locales/zh.json
@@ -12,6 +12,7 @@
     "success": "成功",
     "failed": "失败",
     "cancel": "取消",
+    "confirm": "确认",
     "ok": "确定",
     "close": "关闭",
     "about": "关于",
diff --git a/ui/src/views/device/components/accessDeviceWebDialog.vue b/ui/src/views/device/components/accessDeviceWebDialog.vue
index ffbe87c..a5693be 100644
--- a/ui/src/views/device/components/accessDeviceWebDialog.vue
+++ b/ui/src/views/device/components/accessDeviceWebDialog.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/device/components/addDeviceDialog.vue b/ui/src/views/device/components/addDeviceDialog.vue
index ece9de7..f8aa6c9 100644
--- a/ui/src/views/device/components/addDeviceDialog.vue
+++ b/ui/src/views/device/components/addDeviceDialog.vue
@@ -41,7 +41,8 @@
 
 <script setup lang="ts">
 import { computed, reactive, watch } from 'vue'
-import { BaseInfo, BaseModal, BaseRadioButtonsCompact } from 'gl-web-main/components'
+import { BaseInfo, BaseRadioButtonsCompact } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { getAddDeviceScriptInfoApi } from '@/api/device'
 import { copyText } from 'gl-web-main'
 import { message } from 'ant-design-vue'
@@ -191,10 +192,10 @@ esac
 exit 0
 EOF
 
-# 4. Add execution permissions
+# 5. Add execution permissions
 chmod +x "$SCRIPT_FILE"
 
-# 5. Execute restart once
+# 6. Execute restart once
 "$SCRIPT_FILE" restart
 
 `
diff --git a/ui/src/views/device/components/addDeviceGroupSimpleDialog.vue b/ui/src/views/device/components/addDeviceGroupSimpleDialog.vue
index 91b0367..b6bf7ca 100644
--- a/ui/src/views/device/components/addDeviceGroupSimpleDialog.vue
+++ b/ui/src/views/device/components/addDeviceGroupSimpleDialog.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/device/components/cmdResDetailDialog.vue b/ui/src/views/device/components/cmdResDetailDialog.vue
index e712125..90a2e3f 100644
--- a/ui/src/views/device/components/cmdResDetailDialog.vue
+++ b/ui/src/views/device/components/cmdResDetailDialog.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 
 const props = defineProps<{ open: boolean, type: string, res: any }>()
 
diff --git a/ui/src/views/device/components/commandResponseDialog.vue b/ui/src/views/device/components/commandResponseDialog.vue
index c6c754d..6cc296a 100644
--- a/ui/src/views/device/components/commandResponseDialog.vue
+++ b/ui/src/views/device/components/commandResponseDialog.vue
@@ -80,7 +80,7 @@ import BaseTable from '@/components/base/baseTable.vue'
 import { t } from '@/hooks/useLanguage'
 import { DeviceInfo, ExecuteCommandFormData } from '@/models/device'
 import { useFakeUpgradeProgress } from 'gl-web-main'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { TableColumnType } from 'ant-design-vue'
 import { computed, reactive, watch } from 'vue'
 import CmdResDetailDialog from './cmdResDetailDialog.vue'
diff --git a/ui/src/views/device/components/editDescriptionDialog.vue b/ui/src/views/device/components/editDescriptionDialog.vue
index 769570c..29d36fe 100644
--- a/ui/src/views/device/components/editDescriptionDialog.vue
+++ b/ui/src/views/device/components/editDescriptionDialog.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk, useValidateInfo } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/device/components/executeCommandDialog.vue b/ui/src/views/device/components/executeCommandDialog.vue
index 0e03658..fe77f57 100644
--- a/ui/src/views/device/components/executeCommandDialog.vue
+++ b/ui/src/views/device/components/executeCommandDialog.vue
@@ -64,7 +64,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk, useValidateInfo } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { DeviceInfo, ExecuteCommandFormData } from '@/models/device'
diff --git a/ui/src/views/device/components/moveToDeviceGroupDialog.vue b/ui/src/views/device/components/moveToDeviceGroupDialog.vue
index af5aae7..f241a37 100644
--- a/ui/src/views/device/components/moveToDeviceGroupDialog.vue
+++ b/ui/src/views/device/components/moveToDeviceGroupDialog.vue
@@ -50,7 +50,8 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseInfo, BaseModal } from 'gl-web-main/components'
+import { BaseInfo } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/device/components/rttyTerm.vue b/ui/src/views/device/components/rttyTerm.vue
index a4f7e71..d837ead 100644
--- a/ui/src/views/device/components/rttyTerm.vue
+++ b/ui/src/views/device/components/rttyTerm.vue
@@ -44,7 +44,7 @@ import '@xterm/xterm/css/xterm.css'
 import OverlayAddon from './components/xterm-addon-overlay'
 import ContextMenu from './components/contextMenu.vue'
 import RttyKeyboard from './components/rttyKeyboard.vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { message, Modal } from 'ant-design-vue'
 import { t } from '@/hooks/useLanguage'
 
diff --git a/ui/src/views/deviceGroup/components/addDeviceGroupDialog.vue b/ui/src/views/deviceGroup/components/addDeviceGroupDialog.vue
index 93da431..53fbf84 100644
--- a/ui/src/views/deviceGroup/components/addDeviceGroupDialog.vue
+++ b/ui/src/views/deviceGroup/components/addDeviceGroupDialog.vue
@@ -96,7 +96,8 @@
 
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue'
-import { BaseInfo, BaseModal } from 'gl-web-main/components'
+import { BaseInfo } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, macAddressFormatter, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance, TableColumnType } from 'ant-design-vue'
diff --git a/ui/src/views/deviceGroup/components/addDeviceToDeviceGroupDialog.vue b/ui/src/views/deviceGroup/components/addDeviceToDeviceGroupDialog.vue
index 2f52290..e8cffc5 100644
--- a/ui/src/views/deviceGroup/components/addDeviceToDeviceGroupDialog.vue
+++ b/ui/src/views/deviceGroup/components/addDeviceToDeviceGroupDialog.vue
@@ -69,7 +69,8 @@
 
 <script setup lang="ts">
 import { computed, h, reactive, watch } from 'vue'
-import { BaseInfo, BaseModal } from 'gl-web-main/components'
+import { BaseInfo } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { baseCustomModal, macAddressFormatter, OnBeforeOk } from 'gl-web-main'
 import BaseLoadingContainer from '@/components/base/baseLoadingContainer.vue'
 import { useDeviceStore } from '@/stores/modules/device'
diff --git a/ui/src/views/deviceGroup/components/editDeviceGroupInfoDialog.vue b/ui/src/views/deviceGroup/components/editDeviceGroupInfoDialog.vue
index 71a5d0a..82af6bb 100644
--- a/ui/src/views/deviceGroup/components/editDeviceGroupInfoDialog.vue
+++ b/ui/src/views/deviceGroup/components/editDeviceGroupInfoDialog.vue
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/deviceGroup/components/manageDevicesDialog.vue b/ui/src/views/deviceGroup/components/manageDevicesDialog.vue
index c60d5d7..a77460d 100644
--- a/ui/src/views/deviceGroup/components/manageDevicesDialog.vue
+++ b/ui/src/views/deviceGroup/components/manageDevicesDialog.vue
@@ -66,7 +66,8 @@
 
 <script setup lang="ts">
 import { computed, h, reactive, watch } from 'vue'
-import { BaseInfo, BaseModal } from 'gl-web-main/components'
+import { BaseInfo } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { baseCustomModal, macAddressFormatter, PageLink } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { message, TableColumnType } from 'ant-design-vue'
diff --git a/ui/src/views/personalCenter/components/disable2faDialog.vue b/ui/src/views/personalCenter/components/disable2faDialog.vue
index 4c2459a..808c947 100644
--- a/ui/src/views/personalCenter/components/disable2faDialog.vue
+++ b/ui/src/views/personalCenter/components/disable2faDialog.vue
@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { FormInstance } from 'ant-design-vue'
 import { reqDisable2fa } from '@/api/personal'
diff --git a/ui/src/views/personalCenter/components/editProfileDialog.vue b/ui/src/views/personalCenter/components/editProfileDialog.vue
index fe5e463..28eb02d 100644
--- a/ui/src/views/personalCenter/components/editProfileDialog.vue
+++ b/ui/src/views/personalCenter/components/editProfileDialog.vue
@@ -32,7 +32,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { FormInstance, message } from 'ant-design-vue'
 import { reqUpdateProfile } from '@/api/personal'
diff --git a/ui/src/views/personalCenter/components/enable2faDialog.vue b/ui/src/views/personalCenter/components/enable2faDialog.vue
index ebe37fd..971910b 100644
--- a/ui/src/views/personalCenter/components/enable2faDialog.vue
+++ b/ui/src/views/personalCenter/components/enable2faDialog.vue
@@ -54,7 +54,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { FormInstance } from 'ant-design-vue'
 import QRCode from 'qrcode'
diff --git a/ui/src/views/userManage/components/addUserDialog.vue b/ui/src/views/userManage/components/addUserDialog.vue
index b793d02..f11ed64 100644
--- a/ui/src/views/userManage/components/addUserDialog.vue
+++ b/ui/src/views/userManage/components/addUserDialog.vue
@@ -81,7 +81,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/userManage/components/addUserGroupDialog.vue b/ui/src/views/userManage/components/addUserGroupDialog.vue
index 99abb52..4799579 100644
--- a/ui/src/views/userManage/components/addUserGroupDialog.vue
+++ b/ui/src/views/userManage/components/addUserGroupDialog.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance, message } from 'ant-design-vue'
diff --git a/ui/src/views/userManage/components/associateDeviceGroupDialog.vue b/ui/src/views/userManage/components/associateDeviceGroupDialog.vue
index 548cfc8..00269ae 100644
--- a/ui/src/views/userManage/components/associateDeviceGroupDialog.vue
+++ b/ui/src/views/userManage/components/associateDeviceGroupDialog.vue
@@ -41,7 +41,8 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseInfo, BaseModal } from 'gl-web-main/components'
+import { BaseInfo } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance } from 'ant-design-vue'
diff --git a/ui/src/views/userManage/components/editUserDialog.vue b/ui/src/views/userManage/components/editUserDialog.vue
index 1903204..75aa0ea 100644
--- a/ui/src/views/userManage/components/editUserDialog.vue
+++ b/ui/src/views/userManage/components/editUserDialog.vue
@@ -96,7 +96,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance, Tooltip } from 'ant-design-vue'
diff --git a/ui/src/views/userManage/components/editUserGroupDialog.vue b/ui/src/views/userManage/components/editUserGroupDialog.vue
index 62c86f1..f4a8eb6 100644
--- a/ui/src/views/userManage/components/editUserGroupDialog.vue
+++ b/ui/src/views/userManage/components/editUserGroupDialog.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
-import { BaseModal } from 'gl-web-main/components'
+import BaseModal from '@/components/base/baseModalI18n.vue'
 import { FormRules, OnBeforeOk } from 'gl-web-main'
 import { t } from '@/hooks/useLanguage'
 import { FormInstance, message } from 'ant-design-vue'