From f4d7128ef54f127f4a91f780702536582942d2a7 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 13 Apr 2018 14:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties     |  3 +++
 .../resources/messages/message_ru.properties     |  3 +++
 .../resources/messages/message_zh_CN.properties  |  3 +++
 .../webapp/WEB-INF/include/form/basicInfo.jsp    | 16 ----------------
 .../webapp/WEB-INF/include/form/complexInfo.jsp  |  2 +-
 src/main/webapp/WEB-INF/include/form/ipInfo.jsp  |  2 +-
 .../include/form/multiple/complexInfo.jsp        |  2 +-
 .../webapp/WEB-INF/include/form/stringInfo.jsp   |  2 +-
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp |  2 +-
 .../webapp/WEB-INF/views/cfg/complexCfgList.jsp  |  2 +-
 .../webapp/WEB-INF/views/cfg/multipleCfgForm.jsp |  2 +-
 .../webapp/WEB-INF/views/cfg/multipleCfgList.jsp |  2 +-
 .../webapp/WEB-INF/views/cfg/stringCfgList.jsp   |  2 +-
 13 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 8caf14f15..d00181dcc 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -510,4 +510,7 @@ role_no_new=role dont have new staff!
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=optional
+custom_region=custom region
+please_input=please input
+area_control_type=area control type
 #===============multiole cfg end====================
\ 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 8efea095b..a514a1d49 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -334,4 +334,7 @@ protocol_desc=protocol description
 #==========tedingfuwu end=====================
 #===============multiole cfg start====================
 optional=optional
+custom_region=custom region
+please_input=please input
+area_control_type=area control type
 #===============multiole cfg end====================
\ 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 65ddcbfee..99b2af67c 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -511,4 +511,7 @@ role_no_new=\u89d2\u8272\u672a\u5206\u914d\u65b0\u6210\u5458\uff01
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=\u53EF\u9009
+custom_region=\u81EA\u5B9A\u4E49\u57DF
+please_input=\u8BF7\u8F93\u5165
+area_control_type=\u533A\u57DF\u7BA1\u63A7\u7C7B\u578B
 #===============multiole cfg end====================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 3442e7fed..28c902426 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -99,19 +99,3 @@
          </div>
      </div>
  </div>
-
-
-<!-- <div class="row">
-     <div class="col-md-6">
-         <div class="form-group">
-             <label class="control-label col-md-3">生效范围</label>
-             <div class="col-md-6">
-                 <select class="form-control">
-                     <option>Country 1</option>
-                     <option>Country 2</option>
-                 </select>
-             </div>
-         </div>
-     </div>
-
- </div> -->
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index 5f3d1a904..7fa979b4e 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -98,7 +98,7 @@
 <div class="row">
     <div class="hidden areaType col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
             <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 94b869d80..15b8329ba 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -202,7 +202,7 @@
 		    </div>
 		    <div class="hidden areaType col-md-6">
 		        <div class="form-group">
-		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
 		            <div class="col-md-6">
 		            	<label class="radio-inline">
 		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
index ada63c628..f685d1225 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
@@ -39,7 +39,7 @@ $(function(){
    						>${district.itemValue}</option>
    					</c:forEach>
    				</select>
-            	<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexCfg[tableInfo.tableName].district}"/>
+            	<input type="hidden" name="" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.complexCfg[tableInfo.tableName].district}"/>
             </div>
 		    <div for="complexCfg[${tableInfo.tableName}].district"></div>
         </div>
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 4c885ba07..7bf902008 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -115,7 +115,7 @@
 		    </div> --%>
 		    <div class="hidden areaType col-md-6">
 		        <div class="form-group">
-		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
 		            <div class="col-md-6">
 		            	<label class="radio-inline">
 		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index 414d181b8..d14934bec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -249,7 +249,7 @@ $(function(){
 										            			</option>
 										            		</c:if>
 										            	</select>
-										            	<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
+										            	<input type="hidden" name="" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
 										                <%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
 										            </div>
 										            <div for="cfgDesc"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 851c2ff46..b0d2e1ea7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -116,7 +116,7 @@
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
 								 	<c:if test="${audit==0}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index fe834a1f4..7577582a5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -249,7 +249,7 @@ $(function(){
 								    </div>
 								    <div class="hidden areaType col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
 								            <div class="col-md-6">
 								            	<label class="radio-inline">
 								            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index 1ea8cbff3..f9c9c912c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -153,7 +153,7 @@
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
 								 	<c:if test="${audit==0}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 80b9f4695..d756a7daf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -115,7 +115,7 @@
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
 								 	<c:if test="${audit==0}">