From 03b63b1709f14b8d6c8f62b8744f0870e004be79 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Mon, 22 Oct 2018 20:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties     | 3 ++-
 src/main/resources/messages/message_zh_CN.properties  | 3 ++-
 src/main/webapp/WEB-INF/include/excel/importModal.jsp | 2 +-
 src/main/webapp/static/pages/scripts/importExcel.js   | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index fcce7861b..aae4424a9 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1273,4 +1273,5 @@ ipv4_subnet=IPv4/Subnet Mask
 ipv6_range=IPv6 Range
 ipv6_subnet=IPv6/Subnet Mask
 example=For Example
-letter_cancel_info=Cancel Letter Info
\ No newline at end of file
+letter_cancel_info=Cancel Letter Info
+import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import.
\ 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 c624f2b14..c9a9feeff 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1268,4 +1268,5 @@ ipv4_subnet=IPv4/Subnet mask
 ipv6_range=IPv6 Range
 ipv6_subnet=IPv6/Subnet mask
 example=\u4F8B\u5982
-letter_cancel_info=\u53D6\u6D88\u5BA1\u6838\u6765\u51FD
\ No newline at end of file
+letter_cancel_info=\u53D6\u6D88\u5BA1\u6838\u6765\u51FD
+import_tip_excel=\u8BF7\u9009\u62E9\u6587\u4EF6\u7ED3\u5C3E\u4E3A.xls\u6216\u8005.xlsx\u7684\u6709\u6548Excel\u6587\u4EF6\u5BFC\u5165
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 8ebaa3c89..2b3fe6593 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -4,7 +4,7 @@
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
 	<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
 		onsubmit="loading('<spring:message code='loading'/>');">
-		
+		<input type="hidden"  id="importTip" value="<spring:message code='import_tip_excel'/>">
 		<div class="modal-dialog" role="document" style="width:700px;">
 			<div class="modal-content">
 				<div class="modal-header">
diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js
index 48e1c57b3..a912408ce 100644
--- a/src/main/webapp/static/pages/scripts/importExcel.js
+++ b/src/main/webapp/static/pages/scripts/importExcel.js
@@ -130,13 +130,13 @@ var importCfg=function(){
 	}
  	
  	if(fileName==""){
- 		$("span",$error).html("请选择xls或者xlsx格式文件进行导入...");
+ 		$("span",$error).html($("#importTip").val());
  		$error.removeClass("hide");
  		$error.addClass("show");
     	return false;
     	
  	}else if(fileName.lastIndexOf("\.")==-1||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xls' &&fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xlsx'){
- 		$("span",$error).html("导入的文件后缀，必须为xls或者xlsx...");
+ 		$("span",$error).html($("#importTip").val());
  		$error.removeClass("hide");
  		$error.addClass("show");
     	return false;