msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

refactor(i18n): I18N资源精简，通过配置组合替换重复资源，避免资源配置无序增长；

Browse Source
master
xuxueli 1 month ago
parent 5c48f3b754
commit ff17d48bdd
8 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/XxlJobServiceImpl.java
Unescape View File

@ -168,7 +168,7 @@ public class XxlJobServiceImpl implements XxlJobService {
xxlJobInfoMapper.save(jobInfo);
if (jobInfo.getId() < 1) {
return Response.ofFail ( (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) );
return Response.ofFail ( (I18nUtil.getString("system_opt_add")+I18nUtil.getString("jobinfo_job")+I18nUtil.getString("system_fail")) );
}
// write operation log

6
xxl-job-admin/src/main/java/com/xxl/job/admin/framework/controller/IndexController.java
Unescape View File

@ -60,10 +60,10 @@ public class IndexController {
// init menu-list
List<XxlBootResourceDTO> resourceDTOList = Arrays.asList(
new XxlBootResourceDTO(1, 0, I18nUtil.getString("job_dashboard_name"),1, "", "/dashboard", "fa-home", 1, 0, null),
new XxlBootResourceDTO(2, 0, I18nUtil.getString("jobinfo_name"),1, "", "/jobinfo", " fa-clock-o", 2, 0, null),
new XxlBootResourceDTO(2, 0, I18nUtil.getString("jobinfo_job") + I18nUtil.getString("system_manage"),1, "", "/jobinfo", " fa-clock-o", 2, 0, null),
new XxlBootResourceDTO(3, 0, I18nUtil.getString("joblog_name"),1, "", "/joblog", " fa-database", 3, 0, null),
new XxlBootResourceDTO(4, 0, I18nUtil.getString("jobgroup_name"),1, Consts.ADMIN_ROLE, "/jobgroup", " fa-cloud", 4, 0,null),
new XxlBootResourceDTO(5, 0, I18nUtil.getString("user_manage"),1, Consts.ADMIN_ROLE, "/user", "fa-users", 5, 0, null),
new XxlBootResourceDTO(4, 0, I18nUtil.getString("jobgroup") + I18nUtil.getString("system_manage"),1, Consts.ADMIN_ROLE, "/jobgroup", " fa-cloud", 4, 0,null),
new XxlBootResourceDTO(5, 0, I18nUtil.getString("user_name") + I18nUtil.getString("system_manage"),1, Consts.ADMIN_ROLE, "/user", "fa-users", 5, 0, null),
new XxlBootResourceDTO(9, 0, I18nUtil.getString("admin_help"),1, "", "/help", "fa-book", 6, 0, null)
);

13
xxl-job-admin/src/main/resources/i18n/message_en.properties
Unescape View File

@ -27,6 +27,7 @@ system_opt_fail=operate fail
system_opt_edit=Edit
system_opt_del=Delete
system_opt_copy=Copy
system_manage=Manage
system_invalid=illegal
system_not_found=not exist
system_nav=Navigation
@ -107,10 +108,7 @@ job_dashboard_date_report=Date distribution
job_dashboard_rate_report=Percentage distribution
## job info
jobinfo_name=Job Manage
jobinfo_job=Job
jobinfo_field_add=Add Job
jobinfo_field_update=Edit Job
jobinfo_field_id=Job ID
jobinfo_field_jobgroup=Executor
jobinfo_field_jobdesc=Job name
@ -197,11 +195,8 @@ joblog_rolling_log_failoften=The request for the Rolling log is terminated, the
joblog_logid_invalid=Log ID is illegal
## job group
jobgroup_name=Executor Manage
jobgroup=Executor
jobgroup_list=Executor List
jobgroup_add=Add Executor
jobgroup_edit=Edit Executor
jobgroup_del=Delete Executor
jobgroup_field_title=Executor Name
jobgroup_field_addressType=Registry Type
jobgroup_field_addressType_0=Automatic registration
@ -256,15 +251,13 @@ jobconf_trigger_type_retry=Fail retry trigger
jobconf_trigger_type_misfire=Misfire compensation trigger
## user
user_manage=User Manage
user_name=User
user_username=Username
user_password=Password
user_role=Role
user_role_admin=Admin User
user_role_normal=Normal User
user_permission=Permission
user_add=Add User
user_update=Edit User
user_username_repeat=Username Repeat
user_username_valid=Restrictions start with a lowercase letter and consist of lowercase letters and Numbers
user_password_update_placeholder=Please input password, empty means not update

13
xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
Unescape View File

@ -27,6 +27,7 @@ system_opt_fail=操作失败
system_opt_edit=编辑
system_opt_del=删除
system_opt_copy=复制
system_manage=管理
system_invalid=非法
system_not_found=不存在
system_nav=导航
@ -107,10 +108,7 @@ job_dashboard_date_report=日期分布图
job_dashboard_rate_report=成功比例图
## job info
jobinfo_name=任务管理
jobinfo_job=任务
jobinfo_field_add=新增任务
jobinfo_field_update=更新任务
jobinfo_field_id=任务ID
jobinfo_field_jobgroup=执行器
jobinfo_field_jobdesc=任务名称
@ -197,11 +195,8 @@ joblog_rolling_log_failoften=终止请求Rolling日志,请求失败次数超上
joblog_logid_invalid=日志ID非法
## job group
jobgroup_name=执行器管理
jobgroup=执行器
jobgroup_list=执行器列表
jobgroup_add=新增执行器
jobgroup_edit=编辑执行器
jobgroup_del=删除执行器
jobgroup_field_title=执行器名称
jobgroup_field_addressType=注册方式
jobgroup_field_addressType_0=自动注册
@ -256,15 +251,13 @@ jobconf_trigger_type_retry=失败重试触发
jobconf_trigger_type_misfire=调度过期补偿
## user
user_manage=用户管理
user_name=用户
user_username=账号
user_password=密码
user_role=角色
user_role_admin=管理员
user_role_normal=普通用户
user_permission=权限
user_add=新增用户
user_update=更新用户
user_username_repeat=账号重复
user_username_valid=限制以小写字母开头，由小写字母、数字组成
user_password_update_placeholder=请输入新密码，为空则不更新密码

13
xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties
Unescape View File

@ -27,6 +27,7 @@ system_opt_fail=操作失敗
system_opt_edit=編輯
system_opt_del=刪除
system_opt_copy=復制
system_manage=管理
system_invalid=非法
system_not_found=不存在
system_nav=導航
@ -107,10 +108,7 @@ job_dashboard_date_report=日期分布圖
job_dashboard_rate_report=成功比例圖
## job info
jobinfo_name=任務管理
jobinfo_job=任務
jobinfo_field_add=新增任務
jobinfo_field_update=更新任務
jobinfo_field_id=任務ID
jobinfo_field_jobgroup=執行器
jobinfo_field_jobdesc=任務名稱
@ -197,11 +195,8 @@ joblog_rolling_log_failoften=終止請求Rolling日誌，請求失敗次數超
joblog_logid_invalid=日誌ID非法
## job group
jobgroup_name=執行器管理
jobgroup=執行器
jobgroup_list=執行器列表
jobgroup_add=新增執行器
jobgroup_edit=編輯執行器
jobgroup_del=刪除執行器
jobgroup_field_title=執行器名稱
jobgroup_field_addressType=注冊方式
jobgroup_field_addressType_0=自動注冊
@ -256,15 +251,13 @@ jobconf_trigger_type_retry=失敗重試觸發
jobconf_trigger_type_misfire=調度過期補償
## user
user_manage=用户管理
user_name=用戶
user_username=帳號
user_password=密碼
user_role=角色
user_role_admin=管理員
user_role_normal=普通用戶
user_permission=權限
user_add=新增用戶
user_update=更新用戶
user_username_repeat=帳號重複
user_username_valid=限制以小寫字母開頭，由小寫字母、數字組成
user_password_update_placeholder=請輸入新密碼，為空則不更新密碼

4
xxl-job-admin/src/main/resources/templates/business/group.list.ftl
Unescape View File

@ -89,7 +89,7 @@
<div class="modal-dialog ">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.jobgroup_add}</h4>
<h4 class="modal-title" >${I18n.system_opt_add} ${I18n.jobgroup}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >
@ -137,7 +137,7 @@
<div class="modal-dialog ">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.jobgroup_edit}</h4>
<h4 class="modal-title" >${I18n.system_opt_edit} ${I18n.jobgroup}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >

4
xxl-job-admin/src/main/resources/templates/business/job.list.ftl
Unescape View File

@ -103,7 +103,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.jobinfo_field_add}</h4>
<h4 class="modal-title" >${I18n.system_opt_add} ${I18n.jobinfo_job}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >
@ -363,7 +363,7 @@ exit 0
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.jobinfo_field_update}</h4>
<h4 class="modal-title" >${I18n.system_opt_edit} ${I18n.jobinfo_job}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >

4
xxl-job-admin/src/main/resources/templates/business/user.list.ftl
Unescape View File

@ -74,7 +74,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.user_add}</h4>
<h4 class="modal-title" >${I18n.system_opt_add} ${I18n.user_name}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >
@ -125,7 +125,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" >${I18n.user_update}</h4>
<h4 class="modal-title" >${I18n.system_opt_edit} ${I18n.user_name}</h4>
</div>
<div class="modal-body">
<form class="form-horizontal form" role="form" >

Write Preview
Loading…
Cancel
Save