Update wording :by jimmy

source/vue/xzs-admin/src/main.js

@@ -10,9 +10,11 @@ import '@/styles/index.scss' // global css
 import './icons' // icon
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
+import locale from 'element-ui/lib/locale/lang/en'
 
 Vue.use(Element, {
-  size: 'medium' // set element-ui default size
+  size: 'medium', // set element-ui default size
+  locale
 })
 
 Vue.config.productionTip = false

source/vue/xzs-admin/src/router.js

@@ -55,7 +55,7 @@ const constantRoutes = [
         path: 'student/edit',
         component: () => import('@/views/user/student/edit'),
         name: 'UserStudentEdit',
-        meta: { title: 'Students edit', noCache: true, activeMenu: '/user/student/list' },
+        meta: { title: 'Recruiter edit', noCache: true, activeMenu: '/user/student/list' },
         hidden: true
       },
       {
@@ -134,7 +134,7 @@ const constantRoutes = [
         path: 'question/edit/shortAnswer',
         component: () => import('@/views/exam/question/edit/short-answer'),
         name: 'shortAnswerPage',
-        meta: { title: '简答题编辑', noCache: true, activeMenu: '/exam/question/list' },
+        meta: { title: 'Question edit', noCache: true, activeMenu: '/exam/question/list' },
         hidden: true
       }
     ]

source/vue/xzs-admin/src/utils/request.js

@@ -6,7 +6,7 @@ const request = function (loadtip, query) {
   if (loadtip) {
     loading = vue.prototype.$loading({
       lock: false,
-      text: '正在加载中…',
+      text: 'Loading…',
       spinner: 'el-icon-loading',
       background: 'rgba(0, 0, 0, 0.5)'
     })

source/vue/xzs-admin/src/views/education/industry/edit.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
 
       <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
-        <el-form-item label="industry：" required>
+        <el-form-item label="Industry：" required>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <!-- <el-form-item label="年级：" required>

source/vue/xzs-admin/src/views/education/industry/list.vue

@@ -15,8 +15,8 @@
       </el-form>
 
       <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-        <el-table-column prop="id" label="Id" />
+        <el-table-column prop="id" label="ID" />
-        <el-table-column prop="name" label="industry"/>
+        <el-table-column prop="name" label="Industry"/>
         <el-table-column width="220px" label="Operation" align="center">
           <template slot-scope="{row}">
             <router-link :to="{path:'/education/industry/edit', query:{id:row.id}}" class="link-left">

source/vue/xzs-admin/src/views/education/subject/list.vue

@@ -15,11 +15,11 @@
     </el-form>
 
     <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="id" label="Id" />
+      <el-table-column prop="id" label="ID" />
-      <el-table-column prop="name" label="skill"/>
+      <el-table-column prop="name" label="Skill"/>
       <!-- <el-table-column prop="industry" label="industry"/> -->
       <!-- <el-table-column prop="levelName" label="年级" /> -->
-      <el-table-column width="220px" label="Opration" align="center">
+      <el-table-column width="220px" label="Operation" align="center">
         <template slot-scope="{row}">
           <router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" class="link-left">
             <el-button size="mini">Edit</el-button>

source/vue/xzs-admin/src/views/exam/question/components/Show.vue

@@ -30,9 +30,9 @@
       <div class="q-title" v-html="question.title"/>
     </div>
     <div v-else-if="qType==5" v-loading="qLoading">
-      题干：<div class="q-title" v-html="question.title"/>
+      Question：<div class="q-title" v-html="question.title"/>
-      答案：<div class="q-title" v-html="question.correct"/>
+      Answer：  <div class="q-title" v-html="question.correct"/>
-      解析：<div class="q-title" v-html="question.analyze"/>
+      Analysis：<div class="q-title" v-html="question.analyze"/>
     </div>
     <div v-else>
     </div>

source/vue/xzs-admin/src/views/exam/question/edit/short-answer.vue

@@ -81,7 +81,7 @@ export default {
           { required: true, message: 'Please select subject', trigger: 'change' }
         ],
         title: [
-          { required: true, message: 'Please enter the question stem', trigger: 'blur' }
+          { required: true, message: 'Please enter the question', trigger: 'blur' }
         ],
         correct: [
           { required: true, message: 'Please enter the answer', trigger: 'blur' }

source/vue/xzs-admin/src/views/exam/question/list.vue

@@ -31,9 +31,9 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="id" label="Id" width="90px"/>
+      <el-table-column prop="id" label="ID" width="90px"/>
-      <el-table-column prop="industryName" label="industry" width="120px"/>
+      <el-table-column prop="industryName" label="Industry" width="120px"/>
-      <el-table-column prop="skillName" label="skill" width="120px"/>
+      <el-table-column prop="skillName" label="Skill" width="120px"/>
       <!-- <el-table-column prop="questionType" label="题型" :formatter="questionTypeFormatter" width="70px"/> -->
       <el-table-column prop="shortTitle" label="Question" show-overflow-tooltip/>
       <!-- <el-table-column prop="score" label="分数" width="60px"/> -->

source/vue/xzs-admin/src/views/log/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParam" ref="queryForm" :inline="true">
-      <el-form-item label="User Id：">
+      <el-form-item label="User ID：">
         <el-input v-model="queryParam.userId"></el-input>
       </el-form-item>
       <el-form-item label="Username: ">
@@ -13,7 +13,7 @@
     </el-form>
 
     <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="Id" label="Id" width="100" />
+      <el-table-column prop="Id" label="ID" width="100" />
       <el-table-column prop="userName" label="Username" width="150" />
       <el-table-column prop="realName" label="Name" width="150" />
       <el-table-column prop="content" label="Activity" />

source/vue/xzs-admin/src/views/login/index.vue

@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
 
       <div class="title-container">
-        <h3 class="title">TEKSystemsQuestion Bank Admin Portal</h3>
+        <h3 class="title">TEKSystems Question Bank Admin Portal</h3>
       </div>
 
       <el-form-item prop="userName">
@@ -66,7 +66,7 @@ export default {
   data () {
     const validateUsername = (rule, value, callback) => {
       if (value.length < 5) {
-        callback(new Error('The user name cannot be less than 5 characters.'))
+        callback(new Error('The username can not be less than 5 characters.'))
       } else {
         callback()
       }

source/vue/xzs-admin/src/views/user/admin/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 
-    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
+    <el-form :model="form" ref="form" label-width="120px" v-loading="formLoading" :rules="rules">
       <el-form-item label="User name："  prop="userName" required>
         <el-input v-model="form.userName"></el-input>
       </el-form-item>

source/vue/xzs-admin/src/views/user/admin/list.vue

@@ -13,7 +13,7 @@
     </el-form>
 
     <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="id" label="Id" />
+      <el-table-column prop="id" label="ID" />
       <el-table-column prop="userName" label="Username"/>
       <el-table-column prop="realName" label="Name" />
       <el-table-column prop="sex" label="Gender" width="100px;" :formatter="sexFormatter"/>