后端代码国际化定制

xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java

@@ -114,7 +114,7 @@ public class XxlJobTrigger {
                 jobLog.setTriggerMsg(triggerMsgSb.toString());
                 jobLog.setTriggerMsg(triggerMsgSb.toString());
                 XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
                 XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
 
 
-                // 6、monitor triger
+                // 6、monitor trigger
                 JobFailMonitorHelper.monitor(jobLog.getId());
                 JobFailMonitorHelper.monitor(jobLog.getId());
                 logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
                 logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
 
 
@@ -182,7 +182,7 @@ public class XxlJobTrigger {
             jobLog.setTriggerMsg(triggerMsgSb.toString());
             jobLog.setTriggerMsg(triggerMsgSb.toString());
             XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
             XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
 
 
-            // 6、monitor triger
+            // 6、monitor trigger
             JobFailMonitorHelper.monitor(jobLog.getId());
             JobFailMonitorHelper.monitor(jobLog.getId());
             logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
             logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
         }
         }

xxl-job-admin/src/main/resources/i18n/message_en.properties

-admin_name=Job Scheduling Center 
+admin_name=Job Scheduling Center
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
 admin_version=1.9.1（SNAPSHOT）
 admin_version=1.9.1（SNAPSHOT）
 
 
@@ -171,59 +171,59 @@ joblog_rolling_log_failoften=The request for the Rolling log is terminated, the
 joblog_logid_unvalid=Log ID is illegal
 joblog_logid_unvalid=Log ID is illegal
 
 
 ## job group
 ## job group
-jobgroup_name=执行器管理
-jobgroup_list=执行器列表
-jobgroup_add=新增执行器
-jobgroup_edit=编辑执行器
-jobgroup_del=删除执行器
-jobgroup_field_order=排序
-jobgroup_field_title=名称
-jobgroup_field_addressType=注册方式
-jobgroup_field_addressType_0=自动注册
-jobgroup_field_addressType_1=手动录入
-jobgroup_field_addressType_limit=手动录入注册方式，机器地址不可为空
-jobgroup_field_registryList=机器地址
-jobgroup_field_registryList_unvalid=机器地址格式非法
-jobgroup_field_registryList_placeholder=请输入执行器地址列表，多地址逗号分隔
-jobgroup_field_appName_limit=限制以小写字母开头，由小写字母、数字和中划线组成
-jobgroup_field_appName_length=AppName长度限制为4~64
-jobgroup_field_title_length=名称长度限制为4~12
-jobgroup_field_order_digits=请输入整数
-jobgroup_field_orderrange=取值范围为1~1000
-jobgroup_del_limit_0=拒绝删除，该执行器使用中
-jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
+jobgroup_name=Executor Manage
+jobgroup_list=Executor List
+jobgroup_add=Add Executor
+jobgroup_edit=Edit Executor
+jobgroup_del=Delete Executor
+jobgroup_field_order=Order
+jobgroup_field_title=Title
+jobgroup_field_addressType=Registry Type
+jobgroup_field_addressType_0=Automatic registration
+jobgroup_field_addressType_1=Manual registration
+jobgroup_field_addressType_limit=Manually registration type, the machine address must not be empty
+jobgroup_field_registryList=machine address
+jobgroup_field_registryList_unvalid=registry machine address is illegal
+jobgroup_field_registryList_placeholder=Please enter the machine address, if there are more than one comma separated
+jobgroup_field_appName_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and underscores.
+jobgroup_field_appName_length=AppName length is limited to 4~64
+jobgroup_field_title_length=Title length is limited to 4~12
+jobgroup_field_order_digits=Please enter a positive integer
+jobgroup_field_orderrange=Order is limited to 1~1000
+jobgroup_del_limit_0=Refuse to delete, the executor is being used
+jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
 
 
 ## job conf
 ## job conf
-jobconf_fail_alarm=失败告警
-jobconf_fail_retry=失败重试
-jobconf_route_first=第一个
-jobconf_route_last=最后一个
-jobconf_route_round=轮询
-jobconf_route_random=随机
-jobconf_route_consistenthash=一致性HASH
-jobconf_route_lfu=最不经常使用
-jobconf_route_lru=最近最久未使用
-jobconf_route_failover=故障转移
-jobconf_route_busyover=忙碌转移
-jobconf_route_shard=分片广播
-jobconf_idleBeat=空闲检测
-jobconf_beat=心跳检测
-jobconf_monitor=调度中心监控报警
-jobconf_monitor_detail=监控告警明细
-jobconf_monitor_alarm_title=告警类型
-jobconf_monitor_alarm_type=调度失败
-jobconf_trigger_admin_adress=调度机器
-jobconf_trigger_exe_regtype=执行器-注册方式
-jobconf_trigger_exe_regaddress=执行器-地址列表
-jobconf_trigger_address_empty=调度失败：执行器地址为空
-jobconf_trigger_run=触发调度
-jobconf_trigger_child_run=触发子任务
-jobconf_trigger_fail_retry=调度失败重试
-jobconf_exe_fail_retry=执行失败重试
-jobconf_callback_child_msg1={0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>
-jobconf_callback_child_msg2={0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>
-jobconf_callback_msg1=触发{0}, 触发备注: {1} <br>
+jobconf_fail_alarm=Fail Alarm
+jobconf_fail_retry=Fail Retry
+jobconf_route_first=First
+jobconf_route_last=Last
+jobconf_route_round=Round
+jobconf_route_random=Random
+jobconf_route_consistenthash=Consistent Hash
+jobconf_route_lfu=Least Frequently Used
+jobconf_route_lru=Least Recently Used
+jobconf_route_failover=Failover
+jobconf_route_busyover=Busyover
+jobconf_route_shard=Sharding Broadcast
+jobconf_idleBeat=Idle check
+jobconf_beat=Heartbeats
+jobconf_monitor=Scheduling Center monitor alarm
+jobconf_monitor_detail=monitor alarm details
+jobconf_monitor_alarm_title=Alarm Type
+jobconf_monitor_alarm_type=Trigger Fail
+jobconf_trigger_admin_adress=Trigger machine address
+jobconf_trigger_exe_regtype=Execotor-Registry Type
+jobconf_trigger_exe_regaddress=Execotor-Registry Address
+jobconf_trigger_address_empty=Trigger Fail：registry address is empty
+jobconf_trigger_run=Trigger Job
+jobconf_trigger_child_run=Trigger child job
+jobconf_trigger_fail_retry=Trigger fail retry
+jobconf_exe_fail_retry=Handle fail retry
+jobconf_callback_child_msg1={0}/{1} [Job ID={2}], Trigger {3}, Trigger msg: {4} <br>
+jobconf_callback_child_msg2={0}/{1} [Job ID={2}], Trigger Fail, Trigger msg: Job ID is illegal <br>
+jobconf_callback_msg1=Trigger {0}, Trigger msg: {1} <br>
 
 
 ## help
 ## help
-job_help=使用教程
-job_help_document=官方文档
+job_help=Tutorial
+job_help_document=Official Document
\ No newline at end of file

xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl

@@ -61,7 +61,7 @@
 	            <div class="col-xs-4">
 	            <div class="col-xs-4">
               		<div class="input-group">
               		<div class="input-group">
                 		<span class="input-group-addon">
                 		<span class="input-group-addon">
-	                  		调度时间
+	                  		${I18n.joblog_field_triggerTime}
 	                	</span>
 	                	</span>
 	                	<input type="text" class="form-control" id="filterTime" readonly >
 	                	<input type="text" class="form-control" id="filterTime" readonly >
 	              	</div>
 	              	</div>