summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2017-03-17 03:59:23 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-03-17 03:59:23 +0000
commit7b4ec9688c207fcf897ee86c3e16af9b275d1989 (patch)
tree9a5b04fcec87c58371b44e47044a275fe9299952
parent71f65aab9d72cbd3a015bb2467a254bf542bf38d (diff)
parentbfd3e3c9e950ffb9e83f83e0916889eebb5cbe78 (diff)
Merge "Modify i18n file"
-rw-r--r--alarm-analysis/src/main/webapp/i18n/en-US.json3
-rw-r--r--alarm-analysis/src/main/webapp/i18n/zh-CN.json3
2 files changed, 4 insertions, 2 deletions
diff --git a/alarm-analysis/src/main/webapp/i18n/en-US.json b/alarm-analysis/src/main/webapp/i18n/en-US.json
index 2486638e..da519077 100644
--- a/alarm-analysis/src/main/webapp/i18n/en-US.json
+++ b/alarm-analysis/src/main/webapp/i18n/en-US.json
@@ -44,6 +44,7 @@
"modalTitleCheck":"Check Rule",
"message_rule_name_repeat_error":"Rule Name Repeat",
"message_rule_content_repeat_error":"Rule Content Repeat",
- "message_rule_content":"Rule Content"
+ "message_rule_content":"Rule Content",
+ "message_rule_update_error":"Rule Manage alredy delete they Engine,Please contact admin"
} \ No newline at end of file
diff --git a/alarm-analysis/src/main/webapp/i18n/zh-CN.json b/alarm-analysis/src/main/webapp/i18n/zh-CN.json
index 08933d84..b9335436 100644
--- a/alarm-analysis/src/main/webapp/i18n/zh-CN.json
+++ b/alarm-analysis/src/main/webapp/i18n/zh-CN.json
@@ -44,5 +44,6 @@
"modalTitleCheck":"验证规则",
"message_rule_name_repeat_error":"规则名字重复",
"message_rule_content_repeat_error":"规则内容重复",
- "message_rule_content":"规则内容"
+ "message_rule_content":"规则内容",
+ "message_rule_update_error":"规则的引擎内容被删了,请联系管理员删除这条规则"
} \ No newline at end of file