日志趋势图提示信息国际化

(cherry picked from commit ae4cca4dfeb7346b4ef4d4001a56400d9cda1519)

4 files changed, 10 insertions, 5 deletions

diff --git a/src/main/webapp/WEB-INF/views/cfg/logCfgTrendList.jsp b/src/main/webapp/WEB-INF/views/cfg/logCfgTrendList.jsp
index d1547c859..9e3d44421 100644
--- a/src/main/webapp/WEB-INF/views/cfg/logCfgTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/logCfgTrendList.jsp
@@ -406,7 +406,10 @@ function showActionTransChart(xData,series){
 	        return prev + curr;

 	    });

 	}

+

+	

 	//配置趋势图需特殊提示，所以从公共js文件中拿出无数据提示方法到本文件中

+	var  log_data=$.validator.messages.log_no_data;

 	(function(d) {

 	    "object" === typeof module && module.exports ? module.exports = d: d(Highcharts)

 	})(function(d) { (function(c) {

@@ -416,8 +419,7 @@ function showActionTransChart(xData,series){
 	        g = c.extend,

 	        h = c.each;

 	        g(f.lang, {

-	            noData: "No data display within a specified time range"

-	            //noData: "There is no data this hour."

+	        	noData: log_data

 	        });

 	        f.noData = {

 	            position: {

diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index 387d01225..cff038c88 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -89,6 +89,7 @@
 		arbitrary:"Arbitrarily",
 		log_trend:"Log Trend",
 		info:"Prompt",
-		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!"
+		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
+		log_no_data:"This hour no data"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
index 1ec5cc027..9f7490a33 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -89,6 +89,7 @@
 		arbitrary:"Любой",
 		log_trend:"Журнал Тенденция",
 		info:"Инфо",
-		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!"
+		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
+		log_no_data:"Нет данных за этот час"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index c97e3e49d..11cf137d9 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -89,6 +89,7 @@
 		arbitrary:"任意",
 		log_trend:"日志趋势",
 		info:"提示",
-		protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！"
+		protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！",
+	    log_no_data:"本小时无数据"
 	});
 }(jQuery));