From 16bc12c15bcaa0e30f3a850d8b863ad2d7ee750f Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Mon, 23 Dec 2024 22:33:12 +0800
Subject: [PATCH] feat update placeholder syntax in notify templates

---
 internal/certificate/service.go          | 12 ++++++------
 ui/src/domain/settings.ts                |  4 ++--
 ui/src/i18n/locales/en/nls.settings.json |  4 ++--
 ui/src/i18n/locales/zh/nls.settings.json |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/certificate/service.go b/internal/certificate/service.go
index 3694224c..36acac3b 100644
--- a/internal/certificate/service.go
+++ b/internal/certificate/service.go
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	defaultExpireSubject = "您有 {COUNT} 张证书即将过期"
-	defaultExpireMessage = "有 {COUNT} 张证书即将过期，域名分别为 {DOMAINS}，请保持关注！"
+	defaultExpireSubject = "您有 ${COUNT} 张证书即将过期"
+	defaultExpireMessage = "有 ${COUNT} 张证书即将过期，域名分别为 ${DOMAINS}，请保持关注！"
 )
 
 type CertificateRepository interface {
@@ -88,11 +88,11 @@ func buildMsg(records []domain.Certificate) *domain.NotifyMessage {
 	countStr := strconv.Itoa(count)
 	domainStr := strings.Join(domains, ";")
 
-	subject = strings.ReplaceAll(subject, "{COUNT}", countStr)
-	subject = strings.ReplaceAll(subject, "{DOMAINS}", domainStr)
+	subject = strings.ReplaceAll(subject, "${COUNT}", countStr)
+	subject = strings.ReplaceAll(subject, "${DOMAINS}", domainStr)
 
-	message = strings.ReplaceAll(message, "{COUNT}", countStr)
-	message = strings.ReplaceAll(message, "{DOMAINS}", domainStr)
+	message = strings.ReplaceAll(message, "${COUNT}", countStr)
+	message = strings.ReplaceAll(message, "${DOMAINS}", domainStr)
 
 	// 返回消息
 	return &domain.NotifyMessage{
diff --git a/ui/src/domain/settings.ts b/ui/src/domain/settings.ts
index b022137a..1c041e37 100644
--- a/ui/src/domain/settings.ts
+++ b/ui/src/domain/settings.ts
@@ -33,8 +33,8 @@ export type NotifyTemplate = {
 };
 
 export const defaultNotifyTemplate: NotifyTemplate = {
-  subject: "您有 {COUNT} 张证书即将过期",
-  message: "有 {COUNT} 张证书即将过期，域名分别为 {DOMAINS}，请保持关注！",
+  subject: "您有 ${COUNT} 张证书即将过期",
+  message: "有 ${COUNT} 张证书即将过期，域名分别为 ${DOMAINS}，请保持关注！",
 };
 // #endregion
 
diff --git a/ui/src/i18n/locales/en/nls.settings.json b/ui/src/i18n/locales/en/nls.settings.json
index cde32005..0bf5ea24 100644
--- a/ui/src/i18n/locales/en/nls.settings.json
+++ b/ui/src/i18n/locales/en/nls.settings.json
@@ -19,10 +19,10 @@
   "settings.notification.template.card.title": "Template",
   "settings.notification.template.form.subject.label": "Subject",
   "settings.notification.template.form.subject.placeholder": "Please enter notification subject",
-  "settings.notification.template.form.subject.tooltip": "Optional variables ({COUNT}: number of expiring soon)",
+  "settings.notification.template.form.subject.tooltip": "Optional variables (${COUNT}: number of expiring soon)",
   "settings.notification.template.form.message.label": "Message",
   "settings.notification.template.form.message.placeholder": "Please enter notification message",
-  "settings.notification.template.form.message.tooltip": "Optional variables ({COUNT}: number of expiring soon. {DOMAINS}: Domain list)",
+  "settings.notification.template.form.message.tooltip": "Optional variables (${COUNT}: number of expiring soon. ${DOMAINS}: Domain list)",
   "settings.notification.channels.card.title": "Channels",
   "settings.notification.channel.enabled.on": "On",
   "settings.notification.channel.enabled.off": "Off",
diff --git a/ui/src/i18n/locales/zh/nls.settings.json b/ui/src/i18n/locales/zh/nls.settings.json
index 9c77da23..a57d621f 100644
--- a/ui/src/i18n/locales/zh/nls.settings.json
+++ b/ui/src/i18n/locales/zh/nls.settings.json
@@ -19,10 +19,10 @@
   "settings.notification.template.card.title": "通知模板",
   "settings.notification.template.form.subject.label": "通知主题",
   "settings.notification.template.form.subject.placeholder": "请输入通知主题",
-  "settings.notification.template.form.subject.tooltip": "可选的变量（{COUNT}: 即将过期张数）",
+  "settings.notification.template.form.subject.tooltip": "可选的变量（${COUNT}: 即将过期张数）",
   "settings.notification.template.form.message.label": "通知内容",
   "settings.notification.template.form.message.placeholder": "请输入通知内容",
-  "settings.notification.template.form.message.tooltip": "可选的变量（{COUNT}: 即将过期张数；{DOMAINS}: 域名列表）",
+  "settings.notification.template.form.message.tooltip": "可选的变量（${COUNT}: 即将过期张数；${DOMAINS}: 域名列表）",
   "settings.notification.channels.card.title": "通知渠道",
   "settings.notification.channel.enabled.on": "启用",
   "settings.notification.channel.enabled.off": "未启用",