Pārlūkot izejas kodu

Fix the prompt message when switching auto-renwal cert

0xJacky 3 gadi atpakaļ
vecāks
revīzija
8b60d61b8e

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-# CGO_ENABLED=1 GOOS=linux CC=x86_64-unknown-linux-gnu-gcc CXX=x86_64-unknown-linux-gnu-g++ GOARCH=amd64 go build -o nginx-ui-server -v main.go
+# CGO_ENABLED=1 GOOS=linux CC=x86_64-unknown-linux-gnu-gcc CXX=x86_64-unknown-linux-gnu-g++ GOARCH=amd64 go build -ldflags "-X 'github.com/0xJacky/Nginx-UI/server/settings.buildTime=$(date +%s)'" -o nginx-ui-server -v main.go
 FROM --platform=linux/amd64 debian:buster
 WORKDIR /app
 COPY ./resources/demo/sources.list /etc/apt/sources.list

+ 14 - 14
frontend/src/locale/en/LC_MESSAGES/app.po

@@ -76,7 +76,7 @@ msgstr ""
 msgid "Configurations"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:204
+#: src/views/dashboard/DashBoard.vue:207
 msgid "CPU Status"
 msgstr ""
 
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Disabled successfully"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:282
+#: src/views/dashboard/DashBoard.vue:285
 msgid "Disk IO"
 msgstr ""
 
@@ -231,7 +231,7 @@ msgstr ""
 msgid "Load Averages:"
 msgstr ""
 
-#: src/router/index.js:93 src/views/other/Login.vue:24
+#: src/router/index.js:93 src/views/other/Login.vue:25
 msgid "Login"
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:100
+#: src/views/dashboard/DashBoard.vue:103
 msgid "Memory"
 msgstr ""
 
@@ -269,15 +269,15 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:231
+#: src/views/dashboard/DashBoard.vue:234
 msgid "Network"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:165
+#: src/views/dashboard/DashBoard.vue:168
 msgid "Network Total Receive"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:174
+#: src/views/dashboard/DashBoard.vue:177
 msgid "Network Total Send"
 msgstr ""
 
@@ -331,11 +331,11 @@ msgstr ""
 msgid "Project Team"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:305
+#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:308
 msgid "Reads"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:240
+#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:243
 msgid "Receive"
 msgstr ""
 
@@ -358,7 +358,7 @@ msgstr ""
 msgid "Saved successfully"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:254
+#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:257
 msgid "Send"
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Server error"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:37
+#: src/views/dashboard/DashBoard.vue:38
 msgid "Server Info"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:132
+#: src/views/dashboard/DashBoard.vue:135
 msgid "Storage"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgstr ""
 msgid "Subject Name: %{name}"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:116
+#: src/views/dashboard/DashBoard.vue:119
 msgid "Swap"
 msgstr ""
 
@@ -443,6 +443,6 @@ msgstr ""
 msgid "Username (*)"
 msgstr ""
 
-#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:291
+#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:294
 msgid "Writes"
 msgstr ""

+ 16 - 16
frontend/src/locale/zh_CN/LC_MESSAGES/app.po

@@ -78,7 +78,7 @@ msgstr "配置名称"
 msgid "Configurations"
 msgstr "配置"
 
-#: src/views/dashboard/DashBoard.vue:204
+#: src/views/dashboard/DashBoard.vue:207
 msgid "CPU Status"
 msgstr "CPU 状态"
 
@@ -119,7 +119,7 @@ msgstr "禁用"
 msgid "Disabled successfully"
 msgstr "禁用成功"
 
-#: src/views/dashboard/DashBoard.vue:282
+#: src/views/dashboard/DashBoard.vue:285
 msgid "Disk IO"
 msgstr "磁盘 IO"
 
@@ -233,7 +233,7 @@ msgstr "开源许可"
 msgid "Load Averages:"
 msgstr "系统负载:"
 
-#: src/router/index.js:93 src/views/other/Login.vue:24
+#: src/router/index.js:93 src/views/other/Login.vue:25
 msgid "Login"
 msgstr "登录"
 
@@ -265,7 +265,7 @@ msgstr "网站管理"
 msgid "Manage Users"
 msgstr "用户管理"
 
-#: src/views/dashboard/DashBoard.vue:100
+#: src/views/dashboard/DashBoard.vue:103
 msgid "Memory"
 msgstr "内存"
 
@@ -273,15 +273,15 @@ msgstr "内存"
 msgid "Name"
 msgstr "名称"
 
-#: src/views/dashboard/DashBoard.vue:231
+#: src/views/dashboard/DashBoard.vue:234
 msgid "Network"
 msgstr "网络"
 
-#: src/views/dashboard/DashBoard.vue:165
+#: src/views/dashboard/DashBoard.vue:168
 msgid "Network Total Receive"
 msgstr "下载流量"
 
-#: src/views/dashboard/DashBoard.vue:174
+#: src/views/dashboard/DashBoard.vue:177
 msgid "Network Total Send"
 msgstr "上传流量"
 
@@ -335,11 +335,11 @@ msgstr "私钥路径 (ssl_certificate_key)"
 msgid "Project Team"
 msgstr "项目团队"
 
-#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:305
+#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:308
 msgid "Reads"
 msgstr "读"
 
-#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:240
+#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:243
 msgid "Receive"
 msgstr "下载"
 
@@ -362,7 +362,7 @@ msgstr "保存错误 %{msg}"
 msgid "Saved successfully"
 msgstr "保存成功"
 
-#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:254
+#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:257
 msgid "Send"
 msgstr "上传"
 
@@ -371,7 +371,7 @@ msgstr "上传"
 msgid "Server error"
 msgstr "服务器错误"
 
-#: src/views/dashboard/DashBoard.vue:37
+#: src/views/dashboard/DashBoard.vue:38
 msgid "Server Info"
 msgstr "服务器信息"
 
@@ -387,7 +387,7 @@ msgstr "站点列表"
 msgid "Status"
 msgstr "状态"
 
-#: src/views/dashboard/DashBoard.vue:132
+#: src/views/dashboard/DashBoard.vue:135
 msgid "Storage"
 msgstr "存储"
 
@@ -395,7 +395,7 @@ msgstr "存储"
 msgid "Subject Name: %{name}"
 msgstr "主体名称: %{name}"
 
-#: src/views/dashboard/DashBoard.vue:116
+#: src/views/dashboard/DashBoard.vue:119
 msgid "Swap"
 msgstr ""
 
@@ -423,8 +423,8 @@ msgid ""
 "fields in your configuration file. The configuration filename cannot be "
 "changed after it has been created."
 msgstr ""
-"只有在您的配置文件中有相应字段时,下列的配置才能生效。配置文件名称创建后不"
-"修改。"
+"只有在您的配置文件中有相应字段时,下列的配置才能生效。配置文件名称创建后不"
+"修改。"
 
 #: src/views/domain/DomainEdit.vue:11 src/views/domain/DomainEdit.vue:5
 msgid "This feature is not available in demo."
@@ -451,7 +451,7 @@ msgstr "用户名"
 msgid "Username (*)"
 msgstr "用户名 (*)"
 
-#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:291
+#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:294
 msgid "Writes"
 msgstr "写"
 

+ 16 - 16
frontend/src/locale/zh_TW/LC_MESSAGES/app.po

@@ -79,7 +79,7 @@ msgstr "配置名稱"
 msgid "Configurations"
 msgstr "配置"
 
-#: src/views/dashboard/DashBoard.vue:204
+#: src/views/dashboard/DashBoard.vue:207
 msgid "CPU Status"
 msgstr "中央處理器狀態"
 
@@ -120,7 +120,7 @@ msgstr "禁用"
 msgid "Disabled successfully"
 msgstr "禁用成功"
 
-#: src/views/dashboard/DashBoard.vue:282
+#: src/views/dashboard/DashBoard.vue:285
 msgid "Disk IO"
 msgstr "磁碟 IO"
 
@@ -234,7 +234,7 @@ msgstr "開源許可"
 msgid "Load Averages:"
 msgstr "系統負載:"
 
-#: src/router/index.js:93 src/views/other/Login.vue:24
+#: src/router/index.js:93 src/views/other/Login.vue:25
 msgid "Login"
 msgstr "登入"
 
@@ -266,7 +266,7 @@ msgstr "網站管理"
 msgid "Manage Users"
 msgstr "使用者管理"
 
-#: src/views/dashboard/DashBoard.vue:100
+#: src/views/dashboard/DashBoard.vue:103
 msgid "Memory"
 msgstr "記憶體"
 
@@ -274,15 +274,15 @@ msgstr "記憶體"
 msgid "Name"
 msgstr "名稱"
 
-#: src/views/dashboard/DashBoard.vue:231
+#: src/views/dashboard/DashBoard.vue:234
 msgid "Network"
 msgstr "網路"
 
-#: src/views/dashboard/DashBoard.vue:165
+#: src/views/dashboard/DashBoard.vue:168
 msgid "Network Total Receive"
 msgstr "下載流量"
 
-#: src/views/dashboard/DashBoard.vue:174
+#: src/views/dashboard/DashBoard.vue:177
 msgid "Network Total Send"
 msgstr "上傳流量"
 
@@ -336,11 +336,11 @@ msgstr "私鑰路徑 (ssl_certificate_key)"
 msgid "Project Team"
 msgstr "專案團隊"
 
-#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:305
+#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:308
 msgid "Reads"
 msgstr "讀"
 
-#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:240
+#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:243
 msgid "Receive"
 msgstr "下載"
 
@@ -363,7 +363,7 @@ msgstr "儲存錯誤 %{msg}"
 msgid "Saved successfully"
 msgstr "儲存成功"
 
-#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:254
+#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:257
 msgid "Send"
 msgstr "上傳"
 
@@ -372,7 +372,7 @@ msgstr "上傳"
 msgid "Server error"
 msgstr "伺服器錯誤"
 
-#: src/views/dashboard/DashBoard.vue:37
+#: src/views/dashboard/DashBoard.vue:38
 msgid "Server Info"
 msgstr "伺服器資訊"
 
@@ -388,7 +388,7 @@ msgstr "站點列表"
 msgid "Status"
 msgstr "狀態"
 
-#: src/views/dashboard/DashBoard.vue:132
+#: src/views/dashboard/DashBoard.vue:135
 msgid "Storage"
 msgstr "儲存"
 
@@ -396,7 +396,7 @@ msgstr "儲存"
 msgid "Subject Name: %{name}"
 msgstr "主體名稱: %{name}"
 
-#: src/views/dashboard/DashBoard.vue:116
+#: src/views/dashboard/DashBoard.vue:119
 msgid "Swap"
 msgstr "交換空間"
 
@@ -424,8 +424,8 @@ msgid ""
 "fields in your configuration file. The configuration filename cannot be "
 "changed after it has been created."
 msgstr ""
-"只有在您的配置檔案中有相應欄位時,下列的配置才能生效。配置檔名稱建立後不可"
-"改。"
+"只有在您的配置檔案中有相應欄位時,下列的配置才能生效。配置檔名稱建立後不可"
+"改。"
 
 #: src/views/domain/DomainEdit.vue:11 src/views/domain/DomainEdit.vue:5
 msgid "This feature is not available in demo."
@@ -452,7 +452,7 @@ msgstr "使用者名稱"
 msgid "Username (*)"
 msgstr "使用者名稱 (*)"
 
-#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:291
+#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:294
 msgid "Writes"
 msgstr "寫"
 

+ 1 - 1
frontend/src/views/config/ConfigEdit.vue

@@ -13,7 +13,7 @@
 <script>
 import FooterToolBar from '@/components/FooterToolbar/FooterToolBar'
 import VueItextarea from '@/components/VueItextarea/VueItextarea'
-import $gettext, {$interpolate} from "@/lib/translate/gettext";
+import {$gettext, $interpolate} from "@/lib/translate/gettext"
 
 export default {
     name: 'DomainEdit',

+ 5 - 5
frontend/src/views/domain/DomainEdit.vue

@@ -41,7 +41,7 @@ import VueItextarea from '@/components/VueItextarea/VueItextarea'
 import {columns, columnsSSL} from '@/views/domain/columns'
 import {unparse} from '@/views/domain/methods'
 import CertInfo from '@/views/domain/CertInfo'
-import $gettext, {$interpolate} from "@/lib/translate/gettext";
+import {$gettext, $interpolate} from "@/lib/translate/gettext"
 
 export default {
     name: 'DomainEdit',
@@ -222,15 +222,15 @@ export default {
         change_auto_cert() {
             if (this.config.auto_cert) {
                 this.$api.domain.add_auto_cert(this.name).then(() => {
-                    this.$message.success($interpolate($gettext('Auto-renewal enabled for %{name}', {name: this.name})))
+                    this.$message.success($interpolate($gettext('Auto-renewal enabled for %{name}'), {name: this.name}))
                 }).catch(e => {
-                    this.$message.error(e.message ?? $interpolate($gettext('Enable auto-renewal failed for %{name}', {name: this.name})))
+                    this.$message.error(e.message ?? $interpolate($gettext('Enable auto-renewal failed for %{name}'), {name: this.name}))
                 })
             } else {
                 this.$api.domain.remove_auto_cert(this.name).then(() => {
-                    this.$message.success($interpolate($gettext('Auto-renewal disabled for %{name}', {name: this.name})))
+                    this.$message.success($interpolate($gettext('Auto-renewal disabled for %{name}'), {name: this.name}))
                 }).catch(e => {
-                    this.$message.error(e.message ?? $interpolate($gettext('Disable auto-renewal failed for %{name}', {name: this.name})))
+                    this.$message.error(e.message ?? $interpolate($gettext('Disable auto-renewal failed for %{name}'), {name: this.name}))
                 })
             }
         }