From 1abbf146ce4ba7cd63dc0bae79296c9f4762ae47 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Fri, 14 Jun 2019 11:41:57 +0800
Subject: [PATCH] 1.修改翻译

---
 WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp                        | 12 ++++++------
 WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp |  4 ++--
 WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp                       |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp             |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp                  |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp                |  8 ++++----
 WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp        |  8 ++++----
 WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp         |  4 ++--
 WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp                       |  8 ++++----
 WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp                       |  6 +++---
 WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp                   |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp                   |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp                   |  6 +++---
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp                  |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp                   | 18 +++++++++---------
 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp                |  6 +++---
 WebRoot/static/js/en_control1.js                                           |  2 +-
 17 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
index 8f54ec3..e777835 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp
@@ -84,11 +84,11 @@
 		</div> --%>
 			<div class="class tab1">
 				<p>
-					Classroom management<span class="right jiao"></span>
+					Course management<span class="right jiao"></span>
 				</p>
 				<ul class="menu_1">
 					<li>
-						<p>Courses management</p>
+						<p>Subject management</p>
 						<ul class="menu_2">
 							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
 								<li
@@ -219,22 +219,22 @@
 							<label for="enter_title" class="col-sm-4 control-label">Test title</label>
 							<div class="col-sm-6">
 								<input type="text" class="form-control" id="enter_title"
-									placeholder="Enter the test title (no more than 100 characters)" maxlength="100" minlength="1">
+									placeholder="no more than 100 characters" maxlength="100" minlength="1">
 							</div>
 							<div class="clearfix"></div>
 						</div>
 
 						<div class="form-group">
-							<label for="enter_time" class="col-sm-4 control-label">Test duration (minutes)</label>
+							<label for="enter_time" class="col-sm-4 control-label">Test duration</label>
 							<div class="col-sm-6">
 								<input type="number" class="form-control" id="enter_time"
-									placeholder="Input test duration (unit: minutes)" maxlength="3"
+									placeholder="Input test duration" maxlength="3"
 									oninput="if(value.length>3) value=value.slice(0,3)">
 							</div>
 							<div class="clearfix"></div>
 						</div>
 						<div class="form-group">
-							<label for="enter_time" class="col-sm-4 control-label">grade</label>
+							<label for="enter_time" class="col-sm-4 control-label">Grade</label>
 							<div class="col-sm-6">
 								<select class="chosen-select form-control" name="grade_id"
 									id="grade_id" onchange="getSubjects('${SCHOOL_ID}')"
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
index c9dc4c6..95c03e4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp
@@ -88,10 +88,10 @@
 			</table>
 			<div class="footer">
 				<div class="creat">
-					<input type="button"  onclick="add()" value="Distribute class task" />
+					<input type="button"  onclick="add()" value="Add a task" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="deleteAll()" value="Remove class task" />
+					<input type="button" onclick="deleteAll()" value="Remove" />
 				</div>
 				<div class="page_box">
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
index fe6f844..8097c22 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/grade/en_grade_list2.jsp
@@ -85,7 +85,7 @@
 					<input type="button"  onclick="add()" value="Add a grade" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="del()" value="Remove the grade" />
+					<input type="button" onclick="del()" value="Remove" />
 				</div>
 				<div class="page_box">
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
index 763b51b..b4b8ba7 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/en_headmaster_list2.jsp
@@ -60,7 +60,7 @@
 							<th class="center">Name</th>
 							<th class="center">User Name</th>
 							<th class="center">Password</th>
-							<th class="center">Contact Number</th>
+							<th class="center">Contact No.</th>
 							<th class="center">Class</th>
 							<th class="center">Operation</th>
 						</tr>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
index 063b263..3938ff4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_list.jsp
@@ -125,7 +125,7 @@
 					<input type="button"  onclick="add('${pd.TEACHER_ID}')" value="Arrange Exercise" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="del()" value="Batch delete" />
+					<input type="button" onclick="del()" value="Remove" />
 				</div>
 				<div class="page_box">
 					
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
index a492a23..2d75563 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_report.jsp
@@ -101,9 +101,9 @@
 				<thead>
 					<tr>
 						<th class="center th_name"><div style="width:150px;">Name</div></th>
-						<th class="center "><div style="width:150px;">Average score of the course</div></th>
-						<th class="center"><div style="width:80px;">Course total scores</div></th>
-						<th class="center"><div style="width:150px;">Personal performance</div></th>
+						<th class="center "><div style="width:150px;">Subject average score</div></th>
+						<th class="center"><div style="width:80px;">Subject total scores</div></th>
+						<th class="center"><div style="width:150px;">Completion rate</div></th>
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<th class="center kc"><a
 								 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_ID}');"><div style="width:180px;     margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th>
@@ -130,7 +130,7 @@
 						</c:forEach>
 					</tr>
 					<tr>
-						<td class="center"><div style="width:150px;">course average correct rate of class</div></td>
+						<td class="center"><div style="width:150px;">Class average accuracy</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
index 2e8202f..a55ffeb 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/en_homework_student_report.jsp
@@ -54,12 +54,12 @@ li {
 		</nav>
 	</div>
 	<div class="content row">
-		<div class="content_l col-md-2">
+		<div class="content_l col-sm-2 col-md-2">
 			<ul>
 
 			</ul>
 		</div>
-		<div class="content_r col-md-10">
+		<div class="content_r col-sm-10 col-md-10">
 			<div class="tabel_t">
 				<div class="name">
 					<h1></h1>
@@ -91,7 +91,7 @@ li {
 			</div>
 			<div class="tabel_b">
 				<div class="tab_top row">
-					<div class="col-md-3">Comparison chart of correct rate</div>
+					<div class="col-md-3">Comparison chart of accuracy</div>
 					<div class="col-md-9">
 						<div class="color">
 							<ul>
@@ -103,7 +103,7 @@ li {
 						</div>
 						<div class="check_box">
 							<input type="radio" checked value="1" name="check" id="check1" />
-							<label for="check1">Correct Rate</label> <input type="radio" value="2"
+							<label for="check1">Accuracy</label> <input type="radio" value="2"
 								name="check" id="check2" /> <label for="check2">Marks</label>
 						</div>
 					</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
index 6ad71a9..5af887b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/pagetemplate/en_pagetemplate_list2.jsp
@@ -97,10 +97,10 @@
 			</table>
 			<div class="footer" style="width:auto">
 				<div class="creat">
-					<input type="button" onclick="$('.title_time').modal('show');" value="Add the Template" />
+					<input type="button" onclick="$('.title_time').modal('show');" value="Add a Template" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="del('')" value="Batch delete" />
+					<input type="button" onclick="del('')" value="Remove" />
 				</div>
 				<div class="page_box">
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
index 1f54570..61aeeb4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp
@@ -42,19 +42,19 @@
 			<div class="box_header">
 				<div class="head_box_l">
 					<p>
-						<span class="right_b"></span>test paper management
+						<span class="right_b"></span>Test paper management
 					</p>
 				</div>
 				<div class="head_box_r">
 					<input type="hidden" name="SCHOOL_ID" id="PAPER_ID"
-						value="${pd.SCHOOL_ID}" /> <label>grade: </label>&nbsp;&nbsp; <select
+						value="${pd.SCHOOL_ID}" /> <label>Grade: </label>&nbsp;&nbsp; <select
 						name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
 						<option value="">All</option>
 						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
 							<option value="${var.ID}"
 								<c:if test="${pd.GRADE_ID==var.ID}">selected="true"</c:if>>${var.ENAME}</option>
 						</c:forEach>
-					</select> <label>subject: </label>&nbsp;&nbsp; <select name="subject_id"
+					</select> <label>Subject: </label>&nbsp;&nbsp; <select name="subject_id"
 						id="subject_id" data-placeholder="这里输入所属科目">
 						<option value="">All</option>
 						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
@@ -90,7 +90,7 @@
 							<th>Class</th>
 							<th>Instructor</th>
 							<th>Creation time</th>
-							<th>Recommended test duration</th>
+							<th>Test duration</th>
 							<th>Total score</th>
 						</tr>
 					</thead>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
index ac93edb..00e13e9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp
@@ -41,7 +41,7 @@
 		<div class="box_header">
 			<div class="head_box_l">
 				<p>
-					<span class="right_b"></span>test paper management
+					<span class="right_b"></span>Test paper management
 				</p>
 			</div>
 			<div class="head_box_r">
@@ -69,7 +69,7 @@
 						<th>Creation time</th>
 						<th>Grade</th>
 						<th>Subject</th>
-						<th>Recommended test duration</th>
+						<th>Test duration</th>
 						<th>Total score</th>
 						<th>Operation</th>
 					</tr>
@@ -119,7 +119,7 @@
 					<input type="button"  onclick="parent.$('.title_time').modal('show');" value="Add a new paper" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="deleteAll()" value="Batch Remove" />
+					<input type="button" onclick="deleteAll()" value="Remove" />
 				</div>
 				<div class="page_box">
 					
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
index 37f11f8..342568e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -100,7 +100,7 @@
 					<input type="button" onclick="upload();" value="Batch Import" />
 				</div>
 				<div class="removeAll" >
-					<input type="button" onclick="deleteAll();" value="Batch Delete" />
+					<input type="button" onclick="deleteAll();" value="Remove" />
 				</div>
 				<div class="page_box">
 					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp
index 0b3c185..2b84d53 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp
@@ -34,7 +34,7 @@
 						<div id="zhongxin" style="padding-top: 13px;">
 						<table id="table_report" class="table">
 							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">Course name:</td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">Subject:</td>
 								<td>
 									<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="Enter the Course name">
 									<c:forEach var="item" items="${varList}">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
index 0201935..ef617ee 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp
@@ -33,7 +33,7 @@
 			<div class="box_header">
 				<div class="head_box_l">
 					<p>
-						<span class="right_b"></span>Course management
+						<span class="right_b"></span>Subject management
 					</p>
 				</div>
 				<div class="head_box_r"></div>
@@ -88,10 +88,10 @@
 			</table>
 			<div class="footer" style="width:auto">
 				<div class="creat">
-					<input type="button" onclick="add()" value="Add the subject" />
+					<input type="button" onclick="add()" value="Add a subject" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="del()" value="Remove the subjects" />
+					<input type="button" onclick="del()" value="Remove" />
 				</div>
 				<div class="page_box">
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp
index dc9c984..f24ad47 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp
@@ -103,7 +103,7 @@ li {
 						</div>
 						<div class="check_box">
 							<input type="radio" checked value="1" name="check" id="check1" />
-							<label for="check1">Correct Rate</label> <input type="radio" value="2"
+							<label for="check1">Accuracy</label> <input type="radio" value="2"
 								name="check" id="check2" /> <label for="check2">Marks</label>
 						</div>
 					</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
index 7f8bb80..e17ddd7 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp
@@ -71,15 +71,15 @@
 		<div class="table_box">
 					<table class="table table-striped">
 						<col style="width: 8%" />
-						<col style="width: 10%" />
-						<col style="width: 10%" />
-						<col style="width: 10%" />
-						<col style="width: 15%" />
-						<col style="width: 15%" />
-						<col style="width: 7%" />
-						<col style="width: 8%" />
-						<col style="width: 7%" />
-						<col style="width: 9%" />
+					<col style="width: 10%" />
+					<col style="width: 10%" />
+					<col style="width: 10%" />
+					<col style="width: 15%" />
+					<col style="width: 15%" />
+					<col style="width: 7%" />
+					<col style="width: 8%" />
+					<col style="width: 7%" />
+					<col style="width: 9%" />
 						<tbody>
 							<!-- 开始循环 -->
 							<c:choose>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp
index 20bca4d..6bf8c23 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_report_1.jsp
@@ -74,7 +74,7 @@
 				<thead>
 					<tr>
 						<th class="center th_name"><div style="width:150px;">Name</div></th>
-						<th class="center "><div style="width:150px;">Correct Rate</div></th>
+						<th class="center "><div style="width:150px;">Accuracy</div></th>
 						<th class="center"><div style="width:80px;">Total</div></th>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
 							<th class="center kc"><a
@@ -84,7 +84,7 @@
 				</thead>
 				<tbody>
 					<tr>
-						<td class="center"><div style="width:150px;">Total Marks</div></td>
+						<td class="center"><div style="width:150px;">Total Score</div></td>
 						<td class="center"><div style="width:150px;">N/A</div></td>
 						<td class="center"><div style="width:80px;">N/A</div></td>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
@@ -100,7 +100,7 @@
 						</c:forEach>
 					</tr>
 					<tr>
-						<td class="center"><div style="width:150px;">Correct Rate</div></td>
+						<td class="center"><div style="width:150px;">Accuracy</div></td>
 						<td class="center"><div style="width:150px;">N/A</div></td>
 						<td class="center"><div style="width:80px;">N/A</div></td>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
diff --git a/WebRoot/static/js/en_control1.js b/WebRoot/static/js/en_control1.js
index 06bb15f..5e966fe 100644
--- a/WebRoot/static/js/en_control1.js
+++ b/WebRoot/static/js/en_control1.js
@@ -148,7 +148,7 @@
 		$("#class_avg").html(class_avg);
 		$("#class_max").html(class_max);
 		$(".name h1").html(data.data.studentList[index].NAME);
-		$(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Individual Average Correct Rate" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
+		$(".circle .col-md-6").eq(1).html('<div id="myStathalf1" data-dimension="350" data-text="'+ratio+"%"+'" data-info="Individual Average accuracy" data-width="10" data-fontsize="38" data-percent="'+ratio+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
 		$(".circle .col-md-6").eq(0).html('<div id="myStathalf" data-dimension="350" data-text="'+part_num+'/'+test_num+'" data-info="Tests Paticipated" data-width="10" data-fontsize="38" data-percent="'+partake+'" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div>');
 		$('#myStathalf1').circliful();
 		$('#myStathalf').circliful();
--
libgit2 0.21.4