Browse Source

后端代码国际化定制

xuxueli 7 years ago
parent
commit
3d72c73e69

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java View File

@@ -114,7 +114,7 @@ public class XxlJobTrigger {
114 114
                 jobLog.setTriggerMsg(triggerMsgSb.toString());
115 115
                 XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
116 116
 
117
-                // 6、monitor triger
117
+                // 6、monitor trigger
118 118
                 JobFailMonitorHelper.monitor(jobLog.getId());
119 119
                 logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
120 120
 
@@ -182,7 +182,7 @@ public class XxlJobTrigger {
182 182
             jobLog.setTriggerMsg(triggerMsgSb.toString());
183 183
             XxlJobDynamicScheduler.xxlJobLogDao.updateTriggerInfo(jobLog);
184 184
 
185
-            // 6、monitor triger
185
+            // 6、monitor trigger
186 186
             JobFailMonitorHelper.monitor(jobLog.getId());
187 187
             logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
188 188
         }

+ 53 - 53
xxl-job-admin/src/main/resources/i18n/message_en.properties View File

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

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl View File

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