From 7b3db058bea83dd8befd5f34345dfbdd3154cad8 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 19 Jan 2018 21:19:30 +0800
Subject: [PATCH] =?UTF-8?q?Rolling=20Log=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=9A=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/resources/i18n/message.properties    | 5 ++++-
 .../main/webapp/WEB-INF/template/joblog/joblog.detail.ftl   | 6 +++---
 xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js  | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index 67d95e8a..e30d96f3 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -149,8 +149,11 @@ joblog_clean_type_9=清理所有日志数据
 joblog_handleCode_200=成功
 joblog_handleCode_500=失败
 joblog_handleCode_501=失败重试
-joblog_rolling_log=执行日志
 joblog_kill_log=终止任务
+joblog_rolling_log=执行日志
+joblog_rolling_log_refresh=刷新
+joblog_rolling_log_triggerfail=任务发起调度失败，无法查看执行日志
+joblog_rolling_log_failoften=终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志
 
 ## job group
 jobgroup_name=执行器管理
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
index 4bb0edcd..3a185d64 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
@@ -12,9 +12,9 @@
     <header class="main-header">
         <nav class="navbar navbar-static-top">
             <div class="container">
-            <#-- icon -->
+                <#-- icon -->
                 <div class="navbar-header">
-                    <a class="navbar-brand"><b>执行日志</b>Console</a>
+                    <a class="navbar-brand"><b>${I18n.joblog_rolling_log}</b> Console</a>
                     <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
                         <i class="fa fa-bars"></i>
                     </button>
@@ -33,7 +33,7 @@
                         <li>
                             <a href="javascript:window.location.reload();" >
                                 <i class="fa fa-fw fa-refresh" ></i>
-                                刷新
+                                ${I18n.joblog_rolling_log_refresh}
                             </a>
                         </li>
                     </ul>
diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
index 0b751365..0f556d66 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
@@ -3,7 +3,7 @@ $(function() {
     // trigger fail, end
     if (triggerCode != 200) {
         $('#logConsoleRunning').hide();
-        $('#logConsole').append('<span style="color: red;">任务发起调度失败，无法查看执行日志</span>');
+        $('#logConsole').append('<span style="color: red;">'+ I18n.joblog_rolling_log_triggerfail +'</span>');
         return;
     }
 
@@ -13,7 +13,7 @@ $(function() {
     function pullLog() {
         // pullFailCount, max=20
         if (pullFailCount++ > 20) {
-            logRunStop('<span style="color: red;">终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志</span>');
+            logRunStop('<span style="color: red;">'+ I18n.joblog_rolling_log_failoften +'</span>');
             return;
         }