Browse Source

update document

xuxueli 5 years ago
parent
commit
4eb77dddd1

+ 6 - 0
xxl-job-admin/src/main/resources/i18n/message.properties View File

34
 system_digits=整数
34
 system_digits=整数
35
 system_lengh_limit=长度限制
35
 system_lengh_limit=长度限制
36
 system_permission_limit=权限拦截
36
 system_permission_limit=权限拦截
37
+system_welcome=欢迎
37
 
38
 
38
 ## daterangepicker
39
 ## daterangepicker
39
 daterangepicker_ranges_recent_hour=最近一小时
40
 daterangepicker_ranges_recent_hour=最近一小时
86
 logout_success=注销成功
87
 logout_success=注销成功
87
 logout_fail=注销失败
88
 logout_fail=注销失败
88
 
89
 
90
+## change pwd
91
+change_pwd=修改密码
92
+change_pwd_suc_to_logout=修改密码成功,即将注销登陆
93
+change_pwd_field_newpwd=新密码
94
+
89
 ## dashboard
95
 ## dashboard
90
 job_dashboard_name=运行报表
96
 job_dashboard_name=运行报表
91
 job_dashboard_job_num=任务数量
97
 job_dashboard_job_num=任务数量

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

34
 system_digits=digits
34
 system_digits=digits
35
 system_lengh_limit=Length limit
35
 system_lengh_limit=Length limit
36
 system_permission_limit=Permission limit
36
 system_permission_limit=Permission limit
37
+system_welcome=Welcome
37
 
38
 
38
 ## daterangepicker
39
 ## daterangepicker
39
 daterangepicker_ranges_recent_hour=recent one hour
40
 daterangepicker_ranges_recent_hour=recent one hour
86
 logout_success=Logout success
87
 logout_success=Logout success
87
 logout_fail=Logout fail
88
 logout_fail=Logout fail
88
 
89
 
90
+## change pwd
91
+change_pwd=Change password
92
+change_pwd_suc_to_logout=Change password successful, about to log out login
93
+change_pwd_field_newpwd=new password
94
+
89
 ## dashboard
95
 ## dashboard
90
 job_dashboard_name=Run report
96
 job_dashboard_name=Run report
91
 job_dashboard_job_num=Job number
97
 job_dashboard_job_num=Job number

+ 3 - 3
xxl-job-admin/src/main/resources/static/js/common.1.js View File

125
                 if (data.code == 200) {
125
                 if (data.code == 200) {
126
                     $('#updatePwdModal').modal('hide');
126
                     $('#updatePwdModal').modal('hide');
127
 
127
 
128
-                    layer.msg( '修改密码成功,即将注销登陆' );
128
+                    layer.msg( I18n.change_pwd_suc_to_logout );
129
                     setTimeout(function(){
129
                     setTimeout(function(){
130
                         $.post(base_url + "/logout", function(data, status) {
130
                         $.post(base_url + "/logout", function(data, status) {
131
                             if (data.code == 200) {
131
                             if (data.code == 200) {
133
                             } else {
133
                             } else {
134
                                 layer.open({
134
                                 layer.open({
135
                                     icon: '2',
135
                                     icon: '2',
136
-                                    content: (data.msg||'注销失败')
136
+                                    content: (data.msg|| I18n.logout_fail)
137
                                 });
137
                                 });
138
                             }
138
                             }
139
                         });
139
                         });
141
                 } else {
141
                 } else {
142
                     layer.open({
142
                     layer.open({
143
                         icon: '2',
143
                         icon: '2',
144
-                        content: (data.msg||'修改密码失败')
144
+                        content: (data.msg|| I18n.change_pwd + I18n.system_fail )
145
                     });
145
                     });
146
                 }
146
                 }
147
             });
147
             });

+ 7 - 7
xxl-job-admin/src/main/resources/templates/common/common.macro.ftl View File

84
 					<#-- login user -->
84
 					<#-- login user -->
85
                     <li class="dropdown">
85
                     <li class="dropdown">
86
                         <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
86
                         <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
87
-                            欢迎 ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
87
+                            ${I18n.system_welcome} ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
88
                             <span class="caret"></span>
88
                             <span class="caret"></span>
89
                         </a>
89
                         </a>
90
                         <ul class="dropdown-menu" role="menu">
90
                         <ul class="dropdown-menu" role="menu">
91
-                            <li id="updatePwd" ><a href="javascript:">修改密码</a></li>
91
+                            <li id="updatePwd" ><a href="javascript:">${I18n.change_pwd}</a></li>
92
                             <li id="logoutBtn" ><a href="javascript:">${I18n.logout_btn}</a></li>
92
                             <li id="logoutBtn" ><a href="javascript:">${I18n.logout_btn}</a></li>
93
                         </ul>
93
                         </ul>
94
                     </li>
94
                     </li>
103
 		<div class="modal-dialog ">
103
 		<div class="modal-dialog ">
104
 			<div class="modal-content">
104
 			<div class="modal-content">
105
 				<div class="modal-header">
105
 				<div class="modal-header">
106
-					<h4 class="modal-title" >修改密码</h4>
106
+					<h4 class="modal-title" >${I18n.change_pwd}</h4>
107
 				</div>
107
 				</div>
108
 				<div class="modal-body">
108
 				<div class="modal-body">
109
 					<form class="form-horizontal form" role="form" >
109
 					<form class="form-horizontal form" role="form" >
110
 						<div class="form-group">
110
 						<div class="form-group">
111
-							<label for="lastname" class="col-sm-2 control-label">新密码<font color="red">*</font></label>
112
-							<div class="col-sm-10"><input type="text" class="form-control" name="password" placeholder="请输入新密码" maxlength="100" ></div>
111
+							<label for="lastname" class="col-sm-2 control-label">${I18n.change_pwd_field_newpwd}<font color="red">*</font></label>
112
+							<div class="col-sm-10"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input} ${I18n.change_pwd_field_newpwd}" maxlength="100" ></div>
113
 						</div>
113
 						</div>
114
 						<hr>
114
 						<hr>
115
 						<div class="form-group">
115
 						<div class="form-group">
116
 							<div class="col-sm-offset-3 col-sm-6">
116
 							<div class="col-sm-offset-3 col-sm-6">
117
-								<button type="submit" class="btn btn-primary"  >保存</button>
118
-								<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
117
+								<button type="submit" class="btn btn-primary"  >${I18n.system_save}</button>
118
+								<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.system_cancel}</button>
119
 							</div>
119
 							</div>
120
 						</div>
120
 						</div>
121
 					</form>
121
 					</form>