From db2d2b0f6f535087db9166cafb8fd012f8d8ee43 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Fri, 25 May 2018 17:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96code=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties  |  4 +++-
 src/main/resources/messages/message_ru.properties  |  4 +++-
 .../resources/messages/message_zh_CN.properties    |  2 ++
 .../WEB-INF/views/cfg/website/httpSubList.jsp      | 14 +++++++-------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 8dafbddb0..90a1deb3a 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -561,4 +561,6 @@ ip_pattern=ip Pattern
 port_pattern=port Pattern
 port_mask=port Mask
 ip_range=ip Range
-ip_subnet=Subnet
\ No newline at end of file
+ip_subnet=Subnet
+district=match district
+keywords=keywords
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index a94d90ebe..fb7e2abdc 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -387,4 +387,6 @@ ip_pattern=ip Pattern
 port_pattern=port Pattern
 port_mask=port Mask
 ip_range=ip Range
-ip_subnet=Subnet
\ No newline at end of file
+ip_subnet=Subnet
+district=match district
+keywords=keywords
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index bd9d275e6..63158a28e 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -24,6 +24,8 @@ choose=\u9009\u62E9
 #==========menu begin=====================
 requestInfo=\u6765\u51FD\u4FE1\u606F
 configuration_manage=\u914D\u7F6E\u7BA1\u7406
+district=\u5339\u914D\u533A\u57DF
+keywords=\u5173\u952E\u5B57
 text_enhance_manage=\u6587\u672C\u589E\u5F3A\u7BA1\u63A7
 text_enhance_monitor=\u6587\u672C\u589E\u5F3A\u76D1\u6D4B
 plaintext_manage=\u660E\u6587\u5185\u5BB9\u7BA1\u63A7
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
index 4e5a70cf4..24ce381c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -181,7 +181,7 @@
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='key_word' />:</label><label>${cfg.cfgKeywords }</label>
+				<label><spring:message code='keywords' />:</label><label>${cfg.cfgKeywords }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
@@ -238,12 +238,12 @@
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='strong_string' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='key_word' />:</label><label>${cfg.cfgKeywords }</label>
+				<label><spring:message code='keywords' />:</label><label>${cfg.cfgKeywords }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
@@ -300,7 +300,7 @@
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='key_word' />:</label><label>${cfg.cfgKeywords }</label>
+				<label><spring:message code='keywords' />:</label><label>${cfg.cfgKeywords }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
@@ -357,12 +357,12 @@
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='strong_string' />:</label><label>${cfg.district }</label>
+				<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='key_word' />:</label><label>${cfg.cfgKeywords }</label>
+				<label><spring:message code='keywords' />:</label><label>${cfg.cfgKeywords }</label>
 			</div>
 		</div>
 		<div class="col-md-4">
@@ -419,7 +419,7 @@
 	<div class="row">
 		<div class="col-md-4">
 			<div class="form-group">
-				<label><spring:message code='key_word' />:</label><label>${cfg.cfgKeywords }</label>
+				<label><spring:message code='keywords' />:</label><label>${cfg.cfgKeywords }</label>
 			</div>
 		</div>