From 892f08e0888d7716df969ea4fd1be57cd511b4f6 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 19 Jan 2018 21:49:32 +0800
Subject: [PATCH] =?UTF-8?q?GLUE=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=AE=8C?=
=?UTF-8?q?=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
---
.../src/main/resources/i18n/message.properties | 1 +
.../WEB-INF/template/common/common.exception.ftl | 6 +++---
.../webapp/WEB-INF/template/jobcode/jobcode.index.ftl | 10 +++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index 6c152b1b..f6043692 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -119,6 +119,7 @@ jobinfo_opt_pause=暂停
jobinfo_opt_resume=恢复
jobinfo_opt_log=日志
jobinfo_opt_run=执行
+jobinfo_glue_remark=源码备注
## job log
joblog_name=调度日志
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl
index 15e09b53..b821e327 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl
@@ -2,7 +2,7 @@
- 应用程序异常 (error)
+ Error