diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 4373d0083..6b0bc58c3 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -770,8 +770,9 @@ const message = { composeHelper: 'The composition created through 1Panel editor or template will be saved in the {0}/docker/compose directory.', deleteFile: 'Delete file', + allDelete: 'Permanently Delete', deleteComposeHelper: - 'Delete all files in the {0} directory, including persistent files in this directory. Please proceed with caution!', + '1. Delete container orchestration records \n2. Delete all container orchestration files, including configuration and persistent files', deleteCompose: '" Delete this composition.', apps: 'Apps', local: 'Local', @@ -784,6 +785,8 @@ const message = { contentEmpty: 'Compose content cannot be empty, please enter and try again!', containerNumber: 'Container number', containerStatus: 'Container Status', + exited: 'Exited', + running: 'Running', down: 'Down', up: 'Up', composeDetailHelper: diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 339311332..1754e04cb 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -740,7 +740,8 @@ const message = { composePathHelper: '配置文件保存路徑: {0}', composeHelper: '通過 1Panel 編輯或者模版創建的編排，將保存在 {0}/docker/compose 路徑下', deleteFile: '刪除文件', - deleteComposeHelper: '刪除 {0} 目录下所有文件，包括該文件下的持久化文件等，請謹慎操作！', + allDelete: '徹底刪除', + deleteComposeHelper: '1. 刪除容器編排記錄 \n2. 刪除容器編排的所有文件，包括配置文件和持久化文件', deleteCompose: '" 刪除此編排', apps: '應用商店', local: '本地', @@ -753,6 +754,8 @@ const message = { contentEmpty: '編排內容不能為空，請輸入後重試！', containerNumber: '容器數量', containerStatus: '容器狀態', + exited: '已停止', + running: '運行中', down: '刪除', up: '啟動', composeDetailHelper: '該 compose 為 1Panel 編排外部創建。暫不支持啟停操作。', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 5e4d55099..f25417018 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -737,13 +737,13 @@ const message = { mirrorHelper: '当存在多个加速器时，需要换行显示，例： \nhttp://xxxxxx.m.daocloud.io \nhttps://xxxxxx.mirror.aliyuncs.com', registrieHelper: '当存在多个私有仓库时，需要换行显示，例：\n172.16.10.111:8081 \n172.16.10.112:8081', - compose: '编排', fromChangeHelper: '切换来源将清空当前已编辑内容，是否继续？', composePathHelper: '配置文件保存路径: {0}', composeHelper: '通过 1Panel 编辑或者模版创建的编排，将保存在 {0}/docker/compose 路径下', deleteFile: '删除文件', - deleteComposeHelper: '删除 {0} 目录下所有文件，包括该文件下的持久化文件等，请谨慎操作！', + allDelete: '彻底删除', + deleteComposeHelper: '1. 删除容器编排记录 \n2. 删除容器编排的所有文件，包括配置文件和持久化文件', deleteCompose: '" 删除此编排', apps: '应用商店', local: '本地', @@ -756,6 +756,8 @@ const message = { contentEmpty: '编排内容不能为空，请输入后重试！', containerNumber: '容器数量', containerStatus: '容器状态', + exited: '已停止', + running: '运行中', down: '删除', up: '启动', composeDetailHelper: '该 compose 为 1Panel 编排外部创建。暂不支持启停操作。', diff --git a/frontend/src/views/container/compose/delete/index.vue b/frontend/src/views/container/compose/delete/index.vue index 480d33a13..828a87388 100644 --- a/frontend/src/views/container/compose/delete/index.vue +++ b/frontend/src/views/container/compose/delete/index.vue @@ -7,9 +7,9 @@ > - - - {{ $t('container.deleteComposeHelper', [loadComposeDir()]) }} + + + {{ $t('container.deleteComposeHelper') }} @@ -64,15 +64,6 @@ const acceptParams = async (prop: DialogProps) => { dialogVisible.value = true; }; -const loadComposeDir = () => { - const parts = composePath.value.split('/'); - if (parts.length <= 2) { - return '/'; - } - const parentDirectory = parts.slice(0, -1).join('/'); - return parentDirectory; -}; - const submit = async () => { loading.value = true; let params = { diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index f1b4a6158..0e8f37053 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -180,9 +180,9 @@ const getContainerStatus = (containers) => { const totalCount = safeContainers.length; const statusText = runningCount > 0 ? 'Running' : 'Exited'; if (statusText === 'Exited') { - return `${statusText}`; + return i18n.global.t('container.exited'); } else { - return `${statusText} (${runningCount}/${totalCount})`; + return i18n.global.t('container.running') + ` (${runningCount}/${totalCount})`; } }; const backList = async () => { diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index ded3dbd0d..96b33e854 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -53,7 +53,9 @@ diff --git a/frontend/src/views/website/runtime/go/index.vue b/frontend/src/views/website/runtime/go/index.vue index ad9f31e44..b362f6e1a 100644 --- a/frontend/src/views/website/runtime/go/index.vue +++ b/frontend/src/views/website/runtime/go/index.vue @@ -5,7 +5,9 @@ diff --git a/frontend/src/views/website/runtime/java/index.vue b/frontend/src/views/website/runtime/java/index.vue index 5b43eb530..798f0227b 100644 --- a/frontend/src/views/website/runtime/java/index.vue +++ b/frontend/src/views/website/runtime/java/index.vue @@ -5,7 +5,9 @@ diff --git a/frontend/src/views/website/runtime/node/index.vue b/frontend/src/views/website/runtime/node/index.vue index 9e2e607e7..13dbb8dd5 100644 --- a/frontend/src/views/website/runtime/node/index.vue +++ b/frontend/src/views/website/runtime/node/index.vue @@ -5,7 +5,9 @@