diff --git a/frontend/src/language/en/app.po b/frontend/src/language/en/app.po index ba716322..a2c7c60d 100644 --- a/frontend/src/language/en/app.po +++ b/frontend/src/language/en/app.po @@ -42,7 +42,7 @@ msgstr "Add Site" msgid "Advance Mode" msgstr "Advance Mode" -#: src/components/StdDataDisplay/StdTable.vue:39 +#: src/components/StdDataDisplay/StdTable.vue:41 #: src/views/domain/DomainList.vue:27 #, fuzzy msgid "Are you sure you want to delete ?" @@ -60,11 +60,11 @@ msgstr "Auto-renewal disabled for %{name}" msgid "Auto-renewal enabled for %{name}" msgstr "Auto-renewal enabled for %{name}" -#: src/views/domain/DomainEdit.vue:157 +#: src/views/domain/DomainEdit.vue:158 msgid "Back" msgstr "Back" -#: src/views/other/Error.vue:11 +#: src/views/other/Error.vue:12 #, fuzzy msgid "Back Home" msgstr "Back" @@ -101,7 +101,7 @@ msgstr "Certificate Status" #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29 #: src/views/domain/ngx_conf/LocationEditor.vue:21 #: src/views/domain/ngx_conf/LocationEditor.vue:7 -#: src/views/domain/ngx_conf/NgxConfigEditor.vue:141 +#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145 msgid "Comments" msgstr "Comments" @@ -146,7 +146,7 @@ msgstr "Dashboard" msgid "Database (Optional, default: database)" msgstr "Database (Optional, default: database)" -#: src/components/StdDataDisplay/StdTable.vue:216 +#: src/components/StdDataDisplay/StdTable.vue:218 #: src/views/domain/DomainList.vue:111 msgid "Delete" msgstr "" @@ -292,11 +292,11 @@ msgstr "Location" msgid "Locations" msgstr "Locations" -#: src/routes/index.ts:108 src/views/other/Login.vue:92 +#: src/routes/index.ts:108 src/views/other/Login.vue:99 msgid "Login" msgstr "Login" -#: src/views/other/Login.vue:45 +#: src/views/other/Login.vue:52 msgid "Login successful" msgstr "Login successful" @@ -333,11 +333,11 @@ msgid "Memory and Storage" msgstr "Memory and Storage" #: src/components/StdDataDisplay/StdCurd.vue:24 -#: src/components/StdDataDisplay/StdTable.vue:14 -#: src/components/StdDataDisplay/StdTable.vue:15 -#: src/components/StdDataDisplay/StdTable.vue:19 -#: src/components/StdDataDisplay/StdTable.vue:29 +#: src/components/StdDataDisplay/StdTable.vue:16 +#: src/components/StdDataDisplay/StdTable.vue:17 +#: src/components/StdDataDisplay/StdTable.vue:21 #: src/components/StdDataDisplay/StdTable.vue:31 +#: src/components/StdDataDisplay/StdTable.vue:33 #, fuzzy msgid "Modify" msgstr "Modify Config" @@ -370,7 +370,7 @@ msgstr "Network Total Send" msgid "Next" msgstr "Next" -#: src/components/StdDataDisplay/StdTable.vue:37 +#: src/components/StdDataDisplay/StdTable.vue:39 #: src/views/domain/DomainList.vue:25 #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:17 msgid "No" @@ -393,7 +393,7 @@ msgstr "" "you need to get the certificate." #: src/components/StdDataDisplay/StdCurd.vue:27 -#: src/components/StdDataDisplay/StdTable.vue:38 +#: src/components/StdDataDisplay/StdTable.vue:40 #: src/views/domain/DomainList.vue:26 msgid "OK" msgstr "" @@ -423,11 +423,11 @@ msgstr "Path" msgid "Please input your E-mail!" msgstr "Please input your E-mail!" -#: src/views/other/Install.vue:48 src/views/other/Login.vue:34 +#: src/views/other/Install.vue:48 src/views/other/Login.vue:41 msgid "Please input your password!" msgstr "Please input your password!" -#: src/views/other/Install.vue:42 src/views/other/Login.vue:28 +#: src/views/other/Install.vue:42 src/views/other/Login.vue:35 msgid "Please input your username!" msgstr "Please input your username!" @@ -443,11 +443,11 @@ msgstr "Reads" msgid "Receive" msgstr "Receive" -#: src/components/StdDataDisplay/StdTable.vue:186 +#: src/components/StdDataDisplay/StdTable.vue:187 msgid "Reset" msgstr "" -#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:160 +#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:161 msgid "Save" msgstr "Save" @@ -482,7 +482,7 @@ msgstr "Send" #: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:44 #: src/views/domain/DomainEdit.vue:56 src/views/domain/DomainEdit.vue:65 #: src/views/domain/DomainEdit.vue:83 src/views/domain/DomainList.vue:78 -#: src/views/other/Install.vue:71 src/views/other/Login.vue:49 +#: src/views/other/Install.vue:71 src/views/other/Login.vue:56 msgid "Server error" msgstr "Server error" diff --git a/frontend/src/language/messages.pot b/frontend/src/language/messages.pot index bb390774..7de45112 100644 --- a/frontend/src/language/messages.pot +++ b/frontend/src/language/messages.pot @@ -37,7 +37,7 @@ msgstr "" msgid "Advance Mode" msgstr "" -#: src/components/StdDataDisplay/StdTable.vue:39 +#: src/components/StdDataDisplay/StdTable.vue:41 #: src/views/domain/DomainList.vue:27 msgid "Are you sure you want to delete ?" msgstr "" @@ -54,11 +54,11 @@ msgstr "" msgid "Auto-renewal enabled for %{name}" msgstr "" -#: src/views/domain/DomainEdit.vue:157 +#: src/views/domain/DomainEdit.vue:158 msgid "Back" msgstr "" -#: src/views/other/Error.vue:11 +#: src/views/other/Error.vue:12 msgid "Back Home" msgstr "" @@ -94,7 +94,7 @@ msgstr "" #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29 #: src/views/domain/ngx_conf/LocationEditor.vue:21 #: src/views/domain/ngx_conf/LocationEditor.vue:7 -#: src/views/domain/ngx_conf/NgxConfigEditor.vue:141 +#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145 msgid "Comments" msgstr "" @@ -139,7 +139,7 @@ msgstr "" msgid "Database (Optional, default: database)" msgstr "" -#: src/components/StdDataDisplay/StdTable.vue:216 +#: src/components/StdDataDisplay/StdTable.vue:218 #: src/views/domain/DomainList.vue:111 msgid "Delete" msgstr "" @@ -296,11 +296,11 @@ msgid "Locations" msgstr "" #: src/routes/index.ts:108 -#: src/views/other/Login.vue:92 +#: src/views/other/Login.vue:99 msgid "Login" msgstr "" -#: src/views/other/Login.vue:45 +#: src/views/other/Login.vue:52 msgid "Login successful" msgstr "" @@ -335,11 +335,11 @@ msgid "Memory and Storage" msgstr "" #: src/components/StdDataDisplay/StdCurd.vue:24 -#: src/components/StdDataDisplay/StdTable.vue:14 -#: src/components/StdDataDisplay/StdTable.vue:15 -#: src/components/StdDataDisplay/StdTable.vue:19 -#: src/components/StdDataDisplay/StdTable.vue:29 +#: src/components/StdDataDisplay/StdTable.vue:16 +#: src/components/StdDataDisplay/StdTable.vue:17 +#: src/components/StdDataDisplay/StdTable.vue:21 #: src/components/StdDataDisplay/StdTable.vue:31 +#: src/components/StdDataDisplay/StdTable.vue:33 msgid "Modify" msgstr "" @@ -372,7 +372,7 @@ msgstr "" msgid "Next" msgstr "" -#: src/components/StdDataDisplay/StdTable.vue:37 +#: src/components/StdDataDisplay/StdTable.vue:39 #: src/views/domain/DomainList.vue:25 #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:17 msgid "No" @@ -392,7 +392,7 @@ msgid "Note: The server_name in the current configuration must be the domain nam msgstr "" #: src/components/StdDataDisplay/StdCurd.vue:27 -#: src/components/StdDataDisplay/StdTable.vue:38 +#: src/components/StdDataDisplay/StdTable.vue:40 #: src/views/domain/DomainList.vue:26 msgid "OK" msgstr "" @@ -424,12 +424,12 @@ msgid "Please input your E-mail!" msgstr "" #: src/views/other/Install.vue:48 -#: src/views/other/Login.vue:34 +#: src/views/other/Login.vue:41 msgid "Please input your password!" msgstr "" #: src/views/other/Install.vue:42 -#: src/views/other/Login.vue:28 +#: src/views/other/Login.vue:35 msgid "Please input your username!" msgstr "" @@ -446,12 +446,12 @@ msgstr "" msgid "Receive" msgstr "" -#: src/components/StdDataDisplay/StdTable.vue:186 +#: src/components/StdDataDisplay/StdTable.vue:187 msgid "Reset" msgstr "" #: src/views/config/ConfigEdit.vue:52 -#: src/views/domain/DomainEdit.vue:160 +#: src/views/domain/DomainEdit.vue:161 msgid "Save" msgstr "" @@ -492,7 +492,7 @@ msgstr "" #: src/views/domain/DomainEdit.vue:83 #: src/views/domain/DomainList.vue:78 #: src/views/other/Install.vue:71 -#: src/views/other/Login.vue:49 +#: src/views/other/Login.vue:56 msgid "Server error" msgstr "" diff --git a/frontend/src/language/zh_CN/app.po b/frontend/src/language/zh_CN/app.po index bd55640d..4d4d54db 100644 --- a/frontend/src/language/zh_CN/app.po +++ b/frontend/src/language/zh_CN/app.po @@ -45,7 +45,7 @@ msgstr "添加站点" msgid "Advance Mode" msgstr "高级模式" -#: src/components/StdDataDisplay/StdTable.vue:39 +#: src/components/StdDataDisplay/StdTable.vue:41 #: src/views/domain/DomainList.vue:27 msgid "Are you sure you want to delete ?" msgstr "您确定要删除吗？" @@ -62,11 +62,11 @@ msgstr "成功关闭 %{name} 自动续签" msgid "Auto-renewal enabled for %{name}" msgstr "成功启用 %{name} 自动续签" -#: src/views/domain/DomainEdit.vue:157 +#: src/views/domain/DomainEdit.vue:158 msgid "Back" msgstr "返回" -#: src/views/other/Error.vue:11 +#: src/views/other/Error.vue:12 msgid "Back Home" msgstr "返回首页" @@ -102,7 +102,7 @@ msgstr "证书状态" #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29 #: src/views/domain/ngx_conf/LocationEditor.vue:21 #: src/views/domain/ngx_conf/LocationEditor.vue:7 -#: src/views/domain/ngx_conf/NgxConfigEditor.vue:141 +#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145 msgid "Comments" msgstr "注释" @@ -147,7 +147,7 @@ msgstr "仪表盘" msgid "Database (Optional, default: database)" msgstr "数据库 (可选，默认: database)" -#: src/components/StdDataDisplay/StdTable.vue:216 +#: src/components/StdDataDisplay/StdTable.vue:218 #: src/views/domain/DomainList.vue:111 msgid "Delete" msgstr "删除" @@ -292,11 +292,11 @@ msgstr "Location" msgid "Locations" msgstr "Locations" -#: src/routes/index.ts:108 src/views/other/Login.vue:92 +#: src/routes/index.ts:108 src/views/other/Login.vue:99 msgid "Login" msgstr "登录" -#: src/views/other/Login.vue:45 +#: src/views/other/Login.vue:52 msgid "Login successful" msgstr "登录成功" @@ -333,11 +333,11 @@ msgid "Memory and Storage" msgstr "内存与存储" #: src/components/StdDataDisplay/StdCurd.vue:24 -#: src/components/StdDataDisplay/StdTable.vue:14 -#: src/components/StdDataDisplay/StdTable.vue:15 -#: src/components/StdDataDisplay/StdTable.vue:19 -#: src/components/StdDataDisplay/StdTable.vue:29 +#: src/components/StdDataDisplay/StdTable.vue:16 +#: src/components/StdDataDisplay/StdTable.vue:17 +#: src/components/StdDataDisplay/StdTable.vue:21 #: src/components/StdDataDisplay/StdTable.vue:31 +#: src/components/StdDataDisplay/StdTable.vue:33 msgid "Modify" msgstr "修改" @@ -369,7 +369,7 @@ msgstr "上传流量" msgid "Next" msgstr "下一步" -#: src/components/StdDataDisplay/StdTable.vue:37 +#: src/components/StdDataDisplay/StdTable.vue:39 #: src/views/domain/DomainList.vue:25 #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:17 msgid "No" @@ -390,7 +390,7 @@ msgid "" msgstr "注意：当前配置中的 server_name 必须为需要申请证书的域名。" #: src/components/StdDataDisplay/StdCurd.vue:27 -#: src/components/StdDataDisplay/StdTable.vue:38 +#: src/components/StdDataDisplay/StdTable.vue:40 #: src/views/domain/DomainList.vue:26 msgid "OK" msgstr "确定" @@ -420,11 +420,11 @@ msgstr "路径" msgid "Please input your E-mail!" msgstr "请输入您的邮箱！" -#: src/views/other/Install.vue:48 src/views/other/Login.vue:34 +#: src/views/other/Install.vue:48 src/views/other/Login.vue:41 msgid "Please input your password!" msgstr "请输入您的密码！" -#: src/views/other/Install.vue:42 src/views/other/Login.vue:28 +#: src/views/other/Install.vue:42 src/views/other/Login.vue:35 msgid "Please input your username!" msgstr "请输入您的用户名！" @@ -440,11 +440,11 @@ msgstr "读" msgid "Receive" msgstr "下载" -#: src/components/StdDataDisplay/StdTable.vue:186 +#: src/components/StdDataDisplay/StdTable.vue:187 msgid "Reset" msgstr "重置" -#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:160 +#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:161 msgid "Save" msgstr "保存" @@ -478,7 +478,7 @@ msgstr "上传" #: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:44 #: src/views/domain/DomainEdit.vue:56 src/views/domain/DomainEdit.vue:65 #: src/views/domain/DomainEdit.vue:83 src/views/domain/DomainList.vue:78 -#: src/views/other/Install.vue:71 src/views/other/Login.vue:49 +#: src/views/other/Install.vue:71 src/views/other/Login.vue:56 msgid "Server error" msgstr "服务器错误" diff --git a/frontend/src/language/zh_TW/app.po b/frontend/src/language/zh_TW/app.po index 73ad9313..4d34241e 100644 --- a/frontend/src/language/zh_TW/app.po +++ b/frontend/src/language/zh_TW/app.po @@ -46,7 +46,7 @@ msgstr "新增站點" msgid "Advance Mode" msgstr "高階模式" -#: src/components/StdDataDisplay/StdTable.vue:39 +#: src/components/StdDataDisplay/StdTable.vue:41 #: src/views/domain/DomainList.vue:27 #, fuzzy msgid "Are you sure you want to delete ?" @@ -64,11 +64,11 @@ msgstr "已關閉 %{name} 自動續簽" msgid "Auto-renewal enabled for %{name}" msgstr "已啟用 %{name} 自動續簽" -#: src/views/domain/DomainEdit.vue:157 +#: src/views/domain/DomainEdit.vue:158 msgid "Back" msgstr "返回" -#: src/views/other/Error.vue:11 +#: src/views/other/Error.vue:12 #, fuzzy msgid "Back Home" msgstr "返回" @@ -105,7 +105,7 @@ msgstr "憑證狀態" #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29 #: src/views/domain/ngx_conf/LocationEditor.vue:21 #: src/views/domain/ngx_conf/LocationEditor.vue:7 -#: src/views/domain/ngx_conf/NgxConfigEditor.vue:141 +#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145 msgid "Comments" msgstr "註釋" @@ -150,7 +150,7 @@ msgstr "儀表盤" msgid "Database (Optional, default: database)" msgstr "資料庫 (可選，預設: database)" -#: src/components/StdDataDisplay/StdTable.vue:216 +#: src/components/StdDataDisplay/StdTable.vue:218 #: src/views/domain/DomainList.vue:111 msgid "Delete" msgstr "" @@ -297,11 +297,11 @@ msgstr "Location" msgid "Locations" msgstr "Locations" -#: src/routes/index.ts:108 src/views/other/Login.vue:92 +#: src/routes/index.ts:108 src/views/other/Login.vue:99 msgid "Login" msgstr "登入" -#: src/views/other/Login.vue:45 +#: src/views/other/Login.vue:52 msgid "Login successful" msgstr "登入成功" @@ -339,11 +339,11 @@ msgid "Memory and Storage" msgstr "記憶體和存儲" #: src/components/StdDataDisplay/StdCurd.vue:24 -#: src/components/StdDataDisplay/StdTable.vue:14 -#: src/components/StdDataDisplay/StdTable.vue:15 -#: src/components/StdDataDisplay/StdTable.vue:19 -#: src/components/StdDataDisplay/StdTable.vue:29 +#: src/components/StdDataDisplay/StdTable.vue:16 +#: src/components/StdDataDisplay/StdTable.vue:17 +#: src/components/StdDataDisplay/StdTable.vue:21 #: src/components/StdDataDisplay/StdTable.vue:31 +#: src/components/StdDataDisplay/StdTable.vue:33 #, fuzzy msgid "Modify" msgstr "修改配置" @@ -376,7 +376,7 @@ msgstr "上傳流量" msgid "Next" msgstr "下一步" -#: src/components/StdDataDisplay/StdTable.vue:37 +#: src/components/StdDataDisplay/StdTable.vue:39 #: src/views/domain/DomainList.vue:25 #: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:17 msgid "No" @@ -398,7 +398,7 @@ msgid "" msgstr "注意：當前配置中的 server_name 必須為需要申請憑證的域名。" #: src/components/StdDataDisplay/StdCurd.vue:27 -#: src/components/StdDataDisplay/StdTable.vue:38 +#: src/components/StdDataDisplay/StdTable.vue:40 #: src/views/domain/DomainList.vue:26 msgid "OK" msgstr "確定" @@ -428,11 +428,11 @@ msgstr "路徑" msgid "Please input your E-mail!" msgstr "請輸入您的郵箱！" -#: src/views/other/Install.vue:48 src/views/other/Login.vue:34 +#: src/views/other/Install.vue:48 src/views/other/Login.vue:41 msgid "Please input your password!" msgstr "請輸入您的密碼！" -#: src/views/other/Install.vue:42 src/views/other/Login.vue:28 +#: src/views/other/Install.vue:42 src/views/other/Login.vue:35 msgid "Please input your username!" msgstr "請輸入您的使用者名稱！" @@ -448,11 +448,11 @@ msgstr "讀" msgid "Receive" msgstr "下載" -#: src/components/StdDataDisplay/StdTable.vue:186 +#: src/components/StdDataDisplay/StdTable.vue:187 msgid "Reset" msgstr "" -#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:160 +#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:161 msgid "Save" msgstr "儲存" @@ -487,7 +487,7 @@ msgstr "上傳" #: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:44 #: src/views/domain/DomainEdit.vue:56 src/views/domain/DomainEdit.vue:65 #: src/views/domain/DomainEdit.vue:83 src/views/domain/DomainList.vue:78 -#: src/views/other/Install.vue:71 src/views/other/Login.vue:49 +#: src/views/other/Install.vue:71 src/views/other/Login.vue:56 msgid "Server error" msgstr "伺服器錯誤" diff --git a/frontend/src/version.json b/frontend/src/version.json index 5221c7b5..4e27084e 100644 --- a/frontend/src/version.json +++ b/frontend/src/version.json @@ -1 +1 @@ -{"version":"1.5.0","build_id":29,"total_build":99} \ No newline at end of file +{"version":"1.5.0","build_id":32,"total_build":102} \ No newline at end of file diff --git a/frontend/src/views/pty/Terminal.vue b/frontend/src/views/pty/Terminal.vue index 4d92ebd3..62143072 100644 --- a/frontend/src/views/pty/Terminal.vue +++ b/frontend/src/views/pty/Terminal.vue @@ -5,6 +5,9 @@ import {FitAddon} from 'xterm-addon-fit' import {onMounted, onUnmounted} from 'vue' import _ from 'lodash' import ws from '@/lib/websocket' +import {useGettext} from 'vue3-gettext' + +const {$gettext} = useGettext() let term: Terminal | null let ping: null | NodeJS.Timer @@ -43,7 +46,6 @@ function initTerm() { }) term.loadAddon(fitAddon) - // this.fitAddon = fitAddon term.open(document.getElementById('terminal')!) setTimeout(() => { fitAddon.fit() @@ -83,6 +85,7 @@ function wsOnOpen() { onUnmounted(() => { window.removeEventListener('resize', fit) clearInterval(ping!) + term?.dispose() ping = null websocket.close() }) diff --git a/frontend/version.json b/frontend/version.json index 5221c7b5..4e27084e 100644 --- a/frontend/version.json +++ b/frontend/version.json @@ -1 +1 @@ -{"version":"1.5.0","build_id":29,"total_build":99} \ No newline at end of file +{"version":"1.5.0","build_id":32,"total_build":102} \ No newline at end of file