From bba2c0f19f264d1da8ca8e56d5b61831993c287f Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Tue, 16 Oct 2018 18:17:46 +0800
Subject: [PATCH] =?UTF-8?q?Certificate=20Strategy=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=20Key=20Ring=20=E6=8B=A6=E6=88=AA=E5=BC=BA=E5=BA=A6?=
 =?UTF-8?q?=20Intercept=20intensity=E6=94=B9=E4=B8=BAIntercept=20Related?=
 =?UTF-8?q?=20Domains=20(YES/NO)=E9=BB=98=E8=AE=A4=E6=98=AFNO=20http=20con?=
 =?UTF-8?q?tent=E7=BB=9F=E4=B8=80=E4=B8=BAhttp=20body=E3=80=82=20http=20re?=
 =?UTF-8?q?place=20search=20in=20=E9=BB=98=E8=AE=A4=E4=B8=BAhttp=20respons?=
 =?UTF-8?q?e=20body?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  | 21 ++++++++-----------
 .../WEB-INF/views/cfg/actionRegionForm.jsp    |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 4b5e0d130..0c02bb0e2 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -85,8 +85,8 @@ ssl_control=SSL
 ssl_feature_control=SSL Cert Control
 ssl_sni_control=SSL SNI Control
 ssl_address_control=SSL IP Control
-https_website_content_replace=HTTPS Content Replace
-https_website_control=HTTPS Website Replace
+HTTP(s)_website_content_replace=HTTPS Website Replace
+https_website_control=HTTP(s) Website Replace
 rtp_ip_control=RTP IP Control
 mms_ip_control=MMS IP Control
 rtsp_ip_control=RTSP IP Control
@@ -864,9 +864,9 @@ replace_zone=Search in
 replaced_content=Find
 http_req_uri=HTTP Request URI
 http_req_header=HTTP Request Header
-http_req_body=HTTP Request Content
+http_req_body=HTTP Request Body
 http_resp_header=HTTP Response Header
-http_resp_body=HTTP Response Content
+http_resp_body=HTTP Response Body
 #=============region_value,config form title=================
 #=============userregions===============
 userregion1=Customized Region 1
@@ -950,8 +950,8 @@ domain_monit=Domain Intercepter
 ip_intercepter_whitelist=IP White List
 domain_monit_whitelist=Domain White List
 dns_strategy_reject=DNS Response Strategy Control
-proxy_http_req_body_replace=HTTP Request Content Replace
-proxy_http_res_body_replace=HTTP Response Content Replace
+proxy_http_req_body_replace=HTTP Request Body Replace
+proxy_http_res_body_replace=HTTP Response Body Replace
 dns_fake_ip_reject=DNS Spoofing IP Control
 app_strategy_reject=APP Strategy Control
 app_strategy_ratelimit=APP Strategy Ratelimit
@@ -1102,8 +1102,8 @@ new=New
 basic_protocol_business_type=Basic Identify business classification
 tunnel_behavior_business_type=Behavior Identify business classification
 app_business_type=Application business classification
-pxy_intercept_monit_keyring=Certificate Strategy
-intercept_file_strategy=Certificate Strategy
+pxy_intercept_monit_keyring=Key Ring
+intercept_file_strategy=Key Ring
 root=Root Certificate
 intermediate=Intermediate Certificate
 end_entity=End-entity Certificate
@@ -1245,7 +1245,4 @@ mail_address_whitelist=Mail Address Whitelist
 mail_address_monit=Mail Address Monit
 mail_address_reject=Mail Address Reject
 ipsec_protocol=IPSEC Protocol
-intercept_intensity=Intercept Intensity
-weak_intensity=Weak
-stronger_intensity=Strong
-strong_intensity=Stronger
+intercept_intensity=Intercept Related Domains
diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
index a0a8d1d90..9750f3c9c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
@@ -198,7 +198,7 @@
 				<select name="userRegion1"
 				class="selectpicker show-tick form-control required">
 					<c:forEach items="${fns:getDictList('CONTROL_REPLACE_ZONE')}" var="replaceZoneC">
-						<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
+						<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || (_cfg.userRegion1==null && replaceZoneC.itemCode eq 'http_resp_body')}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>