From e63a707a4d8209e809dee54bd966b7b4ca30db25 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Fri, 7 Sep 2018 11:54:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=9D=A1=E7=BA=A2=E8=89=B2=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=202.P2P=E9=85=8D=E7=BD=AE=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
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_zh_CN.properties | 4 ++--
 src/main/webapp/WEB-INF/tags/sys/message.tag         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 685a5af8a..6c9ac1ea6 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1055,8 +1055,8 @@ not_hex=Not HEX
 
 p2p_reject=P2P Control
 NTC_P2P_IP=IP Configuration
-NTC_P2P_HASH_BIN=HASH Configuration
-NTC_P2P_KEYWORDS=Content Configuration
+NTC_P2P_HASH_BIN=File Marking Configuration
+NTC_P2P_KEYWORDS=eMule Keyword Search Configuration
 
 s_asn=Source ASN
 d_asn=Destination ASN
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 6697c87bb..5b51c7817 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1053,8 +1053,8 @@ not_hex=\u975E\u5341\u516D\u8FDB\u5236
 
 p2p_reject=P2P\u7BA1\u63A7
 NTC_P2P_IP=IP\u914D\u7F6E
-NTC_P2P_HASH_BIN=HASH\u914D\u7F6E
-NTC_P2P_KEYWORDS=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+NTC_P2P_HASH_BIN=\u6587\u4EF6\u6807\u8BC6\u914D\u7F6E
+NTC_P2P_KEYWORDS=eMule\u641C\u7D22\u5173\u952E\u8BCD\u914D\u7F6E
 
 s_asn=\u5BA2\u6237\u7AEFASN
 d_asn=\u670D\u52A1\u7AEFASN
diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag
index 94d5aadb6..83b955daf 100644
--- a/src/main/webapp/WEB-INF/tags/sys/message.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/message.tag
@@ -11,7 +11,7 @@
 </style>
 <script type="text/javascript">top.$.jBox.closeTip();</script>
 <c:if test="${not empty content}">
-	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错'))?'success':'error'}"/></c:if>
+	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/></c:if>
 	<div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div> 
 	<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
 </c:if>
\ No newline at end of file