This is an automated email from the ASF dual-hosted git repository.

zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git


The following commit(s) were added to refs/heads/master by this push:
     new c4a6e3697 Fixed the i18n issue of the [New Notice Policy] form. (#2117)
c4a6e3697 is described below

commit c4a6e3697779fb49ff25304b1f6c2c0c0d7e92b6
Author: Kerwin Bryant <[email protected]>
AuthorDate: Fri Jun 21 20:09:11 2024 +0800

    Fixed the i18n issue of the [New Notice Policy] form. (#2117)
    
    Co-authored-by: Logic <[email protected]>
---
 .../src/app/routes/alert/alert-notice/alert-notice.component.html | 8 ++++----
 web-app/src/assets/i18n/en-US.json                                | 4 ++++
 web-app/src/assets/i18n/zh-CN.json                                | 4 ++++
 web-app/src/assets/i18n/zh-TW.json                                | 4 ++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git 
a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html 
b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
index bcc17dd19..0d8031099 100644
--- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
+++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
@@ -381,7 +381,7 @@
             nzMode="multiple"
             id="receiver"
             name="receiver"
-            nzPlaceHolder="Select a receiver"
+            [nzPlaceHolder]="'alert.notice.receiver.people.placeholder' | i18n"
             nzShowSearch
             required
           >
@@ -397,7 +397,7 @@
             [nzOptions]="templatesOption"
             id="templates"
             name="templates"
-            nzPlaceHolder="Select a template"
+            [nzPlaceHolder]="'alert.notice.template.placeholder' | i18n"
             nzShowSearch
             nzAllowClear
           >
@@ -423,7 +423,7 @@
             name="tags"
             nzAllowClear
             nzMode="multiple"
-            nzPlaceHolder="Select Tags"
+            [nzPlaceHolder]="'alert.notice.rule.tag.placeholder' | i18n"
             nzShowSearch
             required
           >
@@ -441,7 +441,7 @@
             name="priorities"
             nzAllowClear
             nzMode="multiple"
-            nzPlaceHolder="Select Priorities"
+            [nzPlaceHolder]="'alert.notice.rule.priority.placeholder' | i18n"
             nzShowSearch
             required
           >
diff --git a/web-app/src/assets/i18n/en-US.json 
b/web-app/src/assets/i18n/en-US.json
index 7c44511ef..81dc60a81 100644
--- a/web-app/src/assets/i18n/en-US.json
+++ b/web-app/src/assets/i18n/en-US.json
@@ -255,11 +255,13 @@
   "alert.notice.template.preset.true": "System Preset",
   "alert.notice.template.preset.false": "User Custom",
   "alert.notice.template.content": "Template Content",
+  "alert.notice.template.placeholder": "Select a template",
   "alert.notice.receiver": "Notice Receiver",
   "alert.notice.receiver.new": "New Receiver",
   "alert.notice.receiver.edit": "Edit Receiver",
   "alert.notice.receiver.delete": "Delete Receiver",
   "alert.notice.receiver.people": "Receiver",
+  "alert.notice.receiver.people.placeholder": "Select a receiver",
   "alert.notice.receiver.people.name": "Receiver Name",
   "alert.notice.receiver.type": "Notice Type",
   "alert.notice.receiver.setting": "Setting",
@@ -307,7 +309,9 @@
   "alert.notice.rule.all": "Dispatch ALl",
   "alert.notice.rule.enable": "Enable",
   "alert.notice.rule.tag": "Tag Match",
+  "alert.notice.rule.tag.placeholder": "Select Tags",
   "alert.notice.rule.priority": "Priority Match",
+  "alert.notice.rule.priority.placeholder": "Select Priorities",
   "alert.notice.rule.period": "Time Period",
   "alert.notice.rule.period-chose": "Choose Date",
   "alert.notice.rule.period.no-limit": "Unlimited",
diff --git a/web-app/src/assets/i18n/zh-CN.json 
b/web-app/src/assets/i18n/zh-CN.json
index b22b2f8e8..f8f62c5ed 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -255,11 +255,13 @@
   "alert.notice.template.preset.true": "系统内置模版",
   "alert.notice.template.preset.false": "用户自定义模版",
   "alert.notice.template.content": "模板内容",
+  "alert.notice.template.placeholder": "选择模版",
   "alert.notice.receiver": "通知媒介",
   "alert.notice.receiver.new": "新增接收对象",
   "alert.notice.receiver.edit": "编辑接收对象",
   "alert.notice.receiver.delete": "删除接收对象",
   "alert.notice.receiver.people": "接收对象",
+  "alert.notice.receiver.people.placeholder": "选择接收对象",
   "alert.notice.receiver.people.name": "接收对象名称",
   "alert.notice.receiver.type": "通知方式",
   "alert.notice.receiver.setting": "配置",
@@ -308,7 +310,9 @@
   "alert.notice.rule.all": "转发所有",
   "alert.notice.rule.enable": "是否启用",
   "alert.notice.rule.tag": "标签匹配",
+  "alert.notice.rule.tag.placeholder": "选择标签",
   "alert.notice.rule.priority": "级别匹配",
+  "alert.notice.rule.priority.placeholder": "选择级别",
   "alert.notice.rule.period": "时间周期",
   "alert.notice.rule.period-chose": "选择日期",
   "alert.notice.rule.period.no-limit": "无限制",
diff --git a/web-app/src/assets/i18n/zh-TW.json 
b/web-app/src/assets/i18n/zh-TW.json
index a48c261c0..769e538a6 100644
--- a/web-app/src/assets/i18n/zh-TW.json
+++ b/web-app/src/assets/i18n/zh-TW.json
@@ -254,11 +254,13 @@
   "alert.notice.template.preset.true": "系統內建模版",
   "alert.notice.template.preset.false": "用戶自定義模版",
   "alert.notice.template.content": "模板内容",
+  "alert.notice.template.placeholder": "選擇模版",
   "alert.notice.receiver": "通知媒介",
   "alert.notice.receiver.new": "新增接收对象",
   "alert.notice.receiver.edit": "編輯接收对象",
   "alert.notice.receiver.delete": "刪除接收对象",
   "alert.notice.receiver.people": "接收对象",
+  "alert.notice.receiver.people.placeholder": "選擇接收对象",
   "alert.notice.receiver.people.name": "接收对象名稱",
   "alert.notice.receiver.type": "通知方式",
   "alert.notice.receiver.setting": "配置",
@@ -307,7 +309,9 @@
   "alert.notice.rule.all": "轉發所有",
   "alert.notice.rule.enable": "是否啓用",
   "alert.notice.rule.tag": "標簽匹配",
+  "alert.notice.rule.tag.placeholder": "選擇標簽",
   "alert.notice.rule.priority": "級別匹配",
+  "alert.notice.rule.priority.placeholder": "選擇級別",
   "alert.notice.rule.period": "時間週期",
   "alert.notice.rule.period-chose": "選擇日期",
   "alert.notice.rule.period.no-limit": "無限制",


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to