From 6f2a5d6c30fdfc9ea1ad9a88cbac57a39002fb0b Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Wed, 17 Jan 2018 22:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/i18n/message.properties    | 31 +++++++++++++++++--
 .../WEB-INF/template/common/common.macro.ftl  | 10 +++---
 .../src/main/webapp/WEB-INF/template/help.ftl |  6 ++--
 .../main/webapp/WEB-INF/template/index.ftl    | 19 +++++++-----
 .../template/jobgroup/jobgroup.index.ftl      |  2 +-
 .../template/jobinfo/jobinfo.index.ftl        |  2 +-
 .../WEB-INF/template/joblog/joblog.index.ftl  |  4 +--
 .../main/webapp/WEB-INF/template/login.ftl    |  5 +--
 .../src/main/webapp/static/js/index.js        |  2 +-
 9 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index 1ddd6895..c15cedef 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -1,5 +1,12 @@
 admin_name=任务调度中心
+admin_name_full=分布式任务调度平台XXL-JOB
 
+## system
+system_tips=系统提示
+system_ok=确定
+system_close=关闭
+
+## login
 login_btn=登录
 login_remember_me=记住密码
 login_username_placeholder=请输入登录账号
@@ -11,11 +18,29 @@ login_password_lt_5=登录密码不应低于5位
 login_success=登录成功
 login_fail=登录失败
 
+## logout
 logout_btn=注销
 logout_confirm=确认注销登录?
 logout_success=注销成功
 logout_fail=注销失败
 
-system_tips=系统提示
-system_ok=确定2
-system_close=关闭2
\ No newline at end of file
+## dashboard
+job_dashboard_name=运行报表
+job_dashboard_job_num=任务数量
+job_dashboard_job_num_tip=调度中心运行的任务数量
+job_dashboard_trigger_num=调度次数
+job_dashboard_trigger_num_tip=调度中心触发的调度次数
+job_dashboard_jobgroup_num=执行器数量
+job_dashboard_jobgroup_num_tip=调度中心在线的执行器机器数量
+
+job_dashboard_report=调度报表
+
+## job info
+jobinfo_name=任务管理
+joblog_name=调度日志
+jobgroup_name=执行器管理
+
+
+## help
+job_help=使用教程
+job_help_document=官方文档
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
index b94530c1..c66f7c3c 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
@@ -95,11 +95,11 @@
 		<section class="sidebar">
 			<!-- sidebar menu: : style can be found in sidebar.less -->
 			<ul class="sidebar-menu">
-				<li class="header">常用模块</li>
-				<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-aqua"></i><span>任务管理</span></a></li>
-				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-yellow"></i><span>调度日志</span></a></li>
-                <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-green"></i><span>执行器管理</span></a></li>
-				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>使用教程</span></a></li>
+				<#--<li class="header">常用模块</li>-->
+				<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-aqua"></i><span>${I18nUtil.getString("jobinfo_name")}</span></a></li>
+				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-yellow"></i><span>${I18nUtil.getString("joblog_name")}</span></a></li>
+                <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-green"></i><span>${I18nUtil.getString("jobgroup_name")}</span></a></li>
+				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>${I18nUtil.getString("job_help")}</span></a></li>
 			</ul>
 		</section>
 		<!-- /.sidebar -->
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
index d50a968b..765b1cde 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
@@ -16,7 +16,7 @@
 	<div class="content-wrapper">
 		<!-- Content Header (Page header) -->
 		<section class="content-header">
-			<h1>使用教程</h1>
+			<h1>${I18nUtil.getString("job_help")}</h1>
 			<!--
 			<ol class="breadcrumb">
 				<li><a><i class="fa fa-dashboard"></i>调度中心</a></li>
@@ -28,13 +28,13 @@
 		<!-- Main content -->
 		<section class="content">
 			<div class="callout callout-info">
-				<h4>分布式任务调度平台XXL-JOB</h4>
+				<h4>${I18nUtil.getString("admin_name_full")}</h4>
 				<br>
 				<p>
 					<a target="_blank" href="https://github.com/xuxueli/xxl-job">github</a>&nbsp;&nbsp;&nbsp;&nbsp;
 					<iframe src="https://ghbtns.com/github-btn.html?user=xuxueli&repo=xxl-job&type=star&count=true" frameborder="0" scrolling="0" width="170px" height="20px" style="margin-bottom:-5px;"></iframe> 
 					<br><br>
-                    <a target="_blank" href="http://www.xuxueli.com/xxl-job/">文档地址</a>
+                    <a target="_blank" href="http://www.xuxueli.com/xxl-job/">${I18nUtil.getString("job_help_document")}</a>
                     <br><br>
 
 				</p>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
index 56ca0acd..a53bc898 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
@@ -18,7 +18,7 @@
 	<div class="content-wrapper">
 		<!-- Content Header (Page header) -->
 		<section class="content-header">
-			<h1>运行报表</h1>
+			<h1>${I18nUtil.getString("job_dashboard_name")}</h1>
 			<!--
 			<h1>运行报表<small>任务调度中心</small></h1>
 			<ol class="breadcrumb">
@@ -40,13 +40,13 @@
                         <span class="info-box-icon"><i class="fa fa-flag-o"></i></span>
 
                         <div class="info-box-content">
-                            <span class="info-box-text">任务数量</span>
+                            <span class="info-box-text">${I18nUtil.getString("job_dashboard_job_num")}</span>
                             <span class="info-box-number">${jobInfoCount}</span>
 
                             <div class="progress">
                                 <div class="progress-bar" style="width: 100%"></div>
                             </div>
-                            <span class="progress-description">调度中心运行的任务数量</span>
+                            <span class="progress-description">${I18nUtil.getString("job_dashboard_job_num_tip")}</span>
                         </div>
                     </div>
                 </div>
@@ -57,14 +57,14 @@
                         <span class="info-box-icon"><i class="fa fa-calendar"></i></span>
 
                         <div class="info-box-content">
-                            <span class="info-box-text">调度次数</span>
+                            <span class="info-box-text">${I18nUtil.getString("job_dashboard_trigger_num")}</span>
                             <span class="info-box-number">${jobLogCount}</span>
 
                             <div class="progress">
                                 <div class="progress-bar" style="width: 100%" ></div>
                             </div>
                             <span class="progress-description">
-                                调度中心触发的调度次数
+                                ${I18nUtil.getString("job_dashboard_trigger_num_tip")}
                                 <#--<#if jobLogCount gt 0>
                                     调度成功率：${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}<small>%</small>
                                 </#if>-->
@@ -79,13 +79,13 @@
                         <span class="info-box-icon"><i class="fa ion-ios-settings-strong"></i></span>
 
                         <div class="info-box-content">
-                            <span class="info-box-text">执行器数量</span>
+                            <span class="info-box-text">${I18nUtil.getString("job_dashboard_jobgroup_num")}</span>
                             <span class="info-box-number">${executorCount}</span>
 
                             <div class="progress">
                                 <div class="progress-bar" style="width: 100%"></div>
                             </div>
-                            <span class="progress-description">调度中心在线的执行器机器数量</span>
+                            <span class="progress-description">${I18nUtil.getString("job_dashboard_jobgroup_num_tip")}</span>
                         </div>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
                 <div class="col-md-12">
                     <div class="box">
                         <div class="box-header with-border">
-                            <h3 class="box-title">调度报表</h3>
+                            <h3 class="box-title">${I18nUtil.getString("job_dashboard_report")}</h3>
                             <#--<input type="text" class="form-control" id="filterTime" readonly >-->
 
                             <!-- tools box -->
@@ -137,6 +137,9 @@
 	<@netCommon.commonFooter />
 </div>
 <@netCommon.commonScript />
+<script>
+var system_tips = '${I18nUtil.getString("system_tips")}';
+</script>
 <!-- daterangepicker -->
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"></script>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
index 5a8ed9a4..f7e4887c 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
@@ -18,7 +18,7 @@
 	<div class="content-wrapper">
 		<!-- Content Header (Page header) -->
 		<section class="content-header">
-			<h1>执行器管理</h1>
+			<h1>${I18nUtil.getString("jobgroup_name")}</h1>
 		</section>
 
 		<!-- Main content -->
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
index 05bc68a6..7fbc7a49 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
@@ -19,7 +19,7 @@
 	<div class="content-wrapper">
 		<!-- Content Header (Page header) -->
 		<section class="content-header">
-			<h1>任务管理</h1>
+			<h1>${I18nUtil.getString("jobinfo_name")}</h1>
 			<!--
 			<ol class="breadcrumb">
 				<li><a><i class="fa fa-dashboard"></i>调度管理</a></li>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
index 570af1a8..cb5dd7a6 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
@@ -20,7 +20,7 @@
 	<div class="content-wrapper">
 		<!-- Content Header (Page header) -->
 		<section class="content-header">
-			<h1>调度日志</h1>
+			<h1>${I18nUtil.getString("joblog_name")}</h1>
 			<!--
 			<ol class="breadcrumb">
 				<li><a><i class="fa fa-dashboard"></i>调度日志</a></li>
@@ -85,7 +85,7 @@
 			<div class="row">
 				<div class="col-xs-12">
 					<div class="box">
-			            <div class="box-header hide"><h3 class="box-title">调度日志</h3></div>
+			            <#--<div class="box-header hide"><h3 class="box-title">调度日志</h3></div>-->
 			            <div class="box-body">
 			              	<table id="joblog_list" class="table table-bordered table-striped display" width="100%" >
 				                <thead>
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
index d913a014..1dc79d58 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
@@ -39,6 +39,9 @@
 	</div>
 <@netCommon.commonScript />
 <script>
+var system_tips = '${I18nUtil.getString("system_tips")}';
+var system_ok = '${I18nUtil.getString("system_ok")}';
+
 var login_username_empty = '${I18nUtil.getString("login_username_empty")}';
 var login_username_lt_5 = '${I18nUtil.getString("login_username_lt_5")}';
 
@@ -47,8 +50,6 @@ var login_password_lt_5 = '${I18nUtil.getString("login_password_lt_5")}';
 
 var login_success = '${I18nUtil.getString("login_success")}';
 var login_fail = '${I18nUtil.getString("login_fail")}';
-var system_tips = '${I18nUtil.getString("system_tips")}';
-var system_ok = '${I18nUtil.getString("system_ok")}';
 </script>
 <script src="${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"></script>
 <script src="${request.contextPath}/static/adminlte/plugins/iCheck/icheck.min.js"></script>
diff --git a/xxl-job-admin/src/main/webapp/static/js/index.js b/xxl-job-admin/src/main/webapp/static/js/index.js
index e696e52d..64670a3d 100644
--- a/xxl-job-admin/src/main/webapp/static/js/index.js
+++ b/xxl-job-admin/src/main/webapp/static/js/index.js
@@ -63,7 +63,7 @@ $(function () {
                     pieChartInit(data);
                 } else {
                     layer.open({
-                        title: '系统提示',
+                        title: system_tips,
                         content: (data.msg || '调度报表数据加载异常'),
                         icon: '2'
                     });