#1977 多语言调整

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -1170,6 +1170,7 @@ const LANG_EN_US = {
             oldHT: 'Data uploaded by the old version of HiTeach, can not view the Smarter Classroom Assessment',
             wrkCmp: 'Pasted Works',
             dlStuWrk: 'Download Student Work',
+            stuWrk: '學生作品'
         }
     },
     // ElementUI相关
@@ -4031,7 +4032,7 @@ const LANG_EN_US = {
             fileError: "Failed to obtain information",
         },
         'tmManagement': {
-            'page-title': 'TEAM Model Account Management',
+            pageTitle: 'TEAM Model Account Management',
             noset: "Not set yet",
             edit: "Edit",
             name: 'Name',
@@ -4039,7 +4040,7 @@ const LANG_EN_US = {
             gender: "Gender",
             password: 'Password',
             phone: 'Cell phone number',
-            'e-mail': 'E-mail',
+            Email: 'E-mail',
             binding: 'Binding Management',
             isbind: 'Bind',
             unbind: 'Unlink',
@@ -4088,16 +4089,16 @@ const LANG_EN_US = {
             },
         },
         preference: {
-            'page-title': 'Preference Settings',
-            'UI-theme': 'Interface Style Settings',
+            pageTitle: 'Preference Settings',
+            UITheme: 'Interface Style Settings',
             language: 'Language Setting'
         },
-        'change-school': {
-            'page-title': 'Switch School',
-            'current-data-school': 'Current data source school',
-            'Habook-smart-school': 'Habook Smarter School'
+        changeSchool: {
+            pageTitle: 'Switch School',
+            currentDataSchool: 'Current data source school',
+            HabookSmartSchool: 'Habook Smarter School'
         },
-        'homeView-title': 'IES Learning Homepage - AClass ONE',
+        homeViewTitle: 'IES Learning Homepage - AClass ONE',
         calenderCardTitle: 'Calendar',
         recentClass: 'Recent class reminder',
         defaultRecentClass: 'Introduction to Microprocessor Basics and Applications',
@@ -4203,7 +4204,7 @@ const LANG_EN_US = {
         latestNotification: 'Latest Notification',
         postAt: 'Posted on',
         '______________': '______________',
-        'eventView-title': 'Activity Task',
+        eventViewTitle: 'Activity Task',
         nextTask: 'Next Activity',
         allStatus: 'All Activity Status',
         unFinished: 'Unfinished',
@@ -4546,7 +4547,7 @@ const LANG_EN_US = {
                 notice: '【-】--Correctly answered, 【#】--Not answered, 【?】--Multiple choice question',
                 gradeErr: 'Error in score data!'
             },
-            'correctAnswer': 'Correctly Answered',
+            correctAnswer: 'Correctly Answered',
             wrongAnswer: 'Incorrectly Answered',
             unAnswered: 'Not Answered',
             solution: 'Solution',
@@ -4599,11 +4600,11 @@ const LANG_EN_US = {
             delOk: "Delete",
             delCancel: "Cancel",
         },
-        'informview-title': 'Notification Overview',
+        informviewTitle: 'Notification Overview',
         view: 'Go to view',
         read: 'Read',
-        'studyview-title': 'Self-directed Learning',
-        'hiteachview-title': 'HiTeach Lesson Record',
+        studyviewTitle: 'Self-directed Learning',
+        hiteachviewTitle: 'HiTeach Lesson Record',
         hiteachNote: {
             material: 'Lesson Content',
             classInteractionRecord: 'Class Interaction Record',
@@ -4642,7 +4643,7 @@ const LANG_EN_US = {
                 examCount: "SelfPace Test Score",
             },
         },
-        'courseList-title': 'My Course List',
+        courseListTitle: 'My Course List',
         defaultClass: 'Scheduled Course',
         tempClass: 'Temporary Course',
         courseContent: {
@@ -4664,7 +4665,7 @@ const LANG_EN_US = {
             classTime: 'Class Time',
             classroom: 'Classroom',
             teacher: 'Instructor',
-            'co-teacher': 'Co-teacher',
+            coTeacher: 'Co-teacher',
             addedTime: 'Join Course Date',
             syllabus: 'Syllabus Overview',
             seatNo: 'Seat No.',
@@ -4705,7 +4706,7 @@ const LANG_EN_US = {
             myNickName: "My Nickname",
             nickName: "Nickname",
         },
-        'calendar-title': 'Calendar-Second semester of 2020 school year',
+        calendarTitle: 'Calendar-Second semester of 2020 school year',
         today: 'Today',
         importEvent: 'Important School/Class Matters',
         deadlineTasks: 'Ending Activity Tasks',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -4032,7 +4032,7 @@ const LANG_ZH_CN = {
             fileError: "获取信息失败",
         },
         'tmManagement': {
-            'page-title': 'TeamModel 账号管理',
+            pageTitle: 'TeamModel 账号管理',
             noset: "暂未设置",
             edit: "编辑",
             name: '姓名',
@@ -4040,7 +4040,7 @@ const LANG_ZH_CN = {
             gender: "性别",
             password: '密码',
             phone: '手机号码',
-            'e-mail': 'E-mail',
+            Email: 'E-mail',
             binding: '绑定管理',
             isbind: '绑定',
             unbind: '解除绑定',
@@ -4089,16 +4089,16 @@ const LANG_ZH_CN = {
             },
         },
         preference: {
-            'page-title': '偏好设定',
-            'UI-theme': '介面样式设定',
+            pageTitle: '偏好设定',
+            UITheme: '介面样式设定',
             language: '语系设定'
         },
-        'change-school': {
-            'page-title': '切换学校',
-            'current-data-school': '目前资料来源学校',
-            'Habook-smart-school': 'Habook智慧学校'
+        changeSchool: {
+            pageTitle: '切换学校',
+            currentDataSchool: '目前资料来源学校',
+            HabookSmartSchool: 'Habook智慧学校'
         },
-        'homeView-title': '学习资讯总览',
+        homeViewTitle: '学习资讯总览',
         calenderCardTitle: '行事历',
         recentClass: '近期上课提醒',
         defaultRecentClass: '微处理机基础与应用概论',
@@ -4204,7 +4204,7 @@ const LANG_ZH_CN = {
         latestNotification: '最新通知',
         postAt: '发布于',
         '______________': '______________',
-        'eventView-title': '活动任务',
+        eventViewTitle: '活动任务',
         nextTask: '下个活动',
         allStatus: '所有活动状态',
         unFinished: '未完成',
@@ -4547,7 +4547,7 @@ const LANG_ZH_CN = {
                 notice: '【-】--答对，【#】--未作答，【?】--多选题',
                 gradeErr: '成绩信息错误！'
             },
-            'correctAnswer': '答对',
+            correctAnswer: '答对',
             wrongAnswer: '答错',
             unAnswered: '未答',
             solution: '解答',
@@ -4600,11 +4600,11 @@ const LANG_ZH_CN = {
             delOk: "删除",
             delCancel: "取消",
         },
-        'informview-title': '通知总览',
+        informviewTitle: '通知总览',
         view: '前往检视',
         read: '已读',
-        'studyview-title': '自主学习',
-        'hiteachview-title': 'HiTeach课堂记录',
+        studyviewTitle: '自主学习',
+        hiteachviewTitle: 'HiTeach课堂记录',
         hiteachNote: {
             material: '上课内容',
             classInteractionRecord: '课堂互动记录',
@@ -4643,7 +4643,7 @@ const LANG_ZH_CN = {
                 examCount: "测验得分",
             },
         },
-        'courseList-title': '我的课程清单',
+        courseListTitle: '我的课程清单',
         defaultClass: '学校课程',
         tempClass: '老师课程',
         courseContent: {
@@ -4665,7 +4665,7 @@ const LANG_ZH_CN = {
             classTime: '上课时间',
             classroom: '上课教室',
             teacher: '授课教师',
-            'co-teacher': '协同教师',
+            coTeacher: '协同教师',
             addedTime: '加入课程日期',
             syllabus: '课纲概览',
             seatNo: '座号',
@@ -4706,7 +4706,7 @@ const LANG_ZH_CN = {
             myNickName: "我的昵称",
             nickName: "昵称",
         },
-        'calendar-title': '行事历 - 109学年度第二学期',
+        calendarTitle: '行事历 - 109学年度第二学期',
         today: '今天',
         importEvent: '学校班级要事',
         deadlineTasks: '截止活动任务',
@@ -5963,7 +5963,6 @@ const LANG_ZH_CN = {
         ql_text13: '返回',
         ql_text14: '连线题',
         ql_text15: '改错题',
-
         baseExport: {
             title: '选择要导出的表格',
             checkAll: '全选',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -1255,7 +1255,6 @@ const LANG_ZH_TW = {
             confirmInsert: '確認插入',
             addTextDot: '插入著重號',
             canvasStemTip: '畫板'
-
         },
         index: {
             item: '試題',
@@ -4033,7 +4032,7 @@ const LANG_ZH_TW = {
             fileError: "獲取資訊失敗",
         },
         'tmManagement': {
-            'page-title': 'TEAM Model 帳號管理',
+            pageTitle: 'TEAM Model 帳號管理',
             noset: "暫未設定",
             edit: "編輯",
             name: '姓名',
@@ -4041,7 +4040,7 @@ const LANG_ZH_TW = {
             gender: "性別",
             password: '密碼',
             phone: '手機號碼',
-            'E-mail': 'E-mail',
+            Email: 'E-mail',
             binding: '綁定管理',
             isbind: '綁定',
             unbind: '解除綁定',
@@ -4090,16 +4089,16 @@ const LANG_ZH_TW = {
             },
         },
         preference: {
-            'page-title': '偏好設定',
-            'UI-theme': '介面樣式設定',
+            pageTitle: '偏好設定',
+            UITheme: '介面樣式設定',
             language: '語系設定'
         },
-        'change-school': {
-            'page-title': '切換學校',
-            'current-data-school': '目前資料來源學校',
-            'Habook-smart-school': 'HABOOK智慧學校'
+        changeSchool: {
+            pageTitle: '切換學校',
+            currentDataSchool: '目前資料來源學校',
+            HabookSmartSchool: 'HABOOK智慧學校'
         },
-        'homeView-title': 'IES學習主頁 - AClass ONE',
+        homeViewTitle: 'IES學習主頁 - AClass ONE',
         calenderCardTitle: '行事曆',
         recentClass: '近期上課提醒',
         defaultRecentClass: '微處理機基礎與應用概論',
@@ -4205,7 +4204,7 @@ const LANG_ZH_TW = {
         latestNotification: '最新通知',
         postAt: '發布於',
         '______________': '______________',
-        'eventView-title': '活動任務',
+        eventViewTitle: '活動任務',
         nextTask: '下個活動',
         allStatus: '所有活動狀態',
         unFinished: '未完成',
@@ -4548,7 +4547,7 @@ const LANG_ZH_TW = {
                 notice: '【-】--答對，【#】--未作答，【?】--多選題',
                 gradeErr: '成績數據錯誤！ '
             },
-            'correctAnswer': '答對',
+            correctAnswer: '答對',
             wrongAnswer: '答錯',
             unAnswered: '未答',
             solution: '解答',
@@ -4601,11 +4600,11 @@ const LANG_ZH_TW = {
             delOk: "刪除",
             delCancel: "取消",
         },
-        'informview-title': '通知總覽',
+        informviewTitle: '通知總覽',
         view: '前往檢視',
         read: '已讀',
-        'studyview-title': '自主學習',
-        'hiteachview-title': 'HiTeach課堂記錄',
+        studyviewTitle: '自主學習',
+        hiteachviewTitle: 'HiTeach課堂記錄',
         hiteachNote: {
             material: '上課內容',
             classInteractionRecord: '課堂互動記錄',
@@ -4644,7 +4643,7 @@ const LANG_ZH_TW = {
                 examCount: "測驗得分",
             },
         },
-        'courseList-title': '我的課程清單',
+        courseListTitle: '我的課程清單',
         defaultClass: '學校課程',
         tempClass: '個人課程',
         courseContent: {
@@ -4666,7 +4665,7 @@ const LANG_ZH_TW = {
             classTime: '上課時間',
             classroom: '上課教室',
             teacher: '授課教師',
-            'co-teacher': '協同教師',
+            coTeacher: '協同教師',
             addedTime: '加入課程日期',
             syllabus: '課程要目概覽',
             seatNo: '座號',
@@ -4707,7 +4706,7 @@ const LANG_ZH_TW = {
             myNickName: "我的暱稱",
             nickName: "暱稱",
         },
-        'calendar-title': '行事歷 - 109學年度第二學期',
+        calendarTitle: '行事歷 - 109學年度第二學期',
         today: '今天',
         importEvent: '學校班級要事',
         deadlineTasks: '截止活動任務',

TEAMModelOS/ClientApp/src/components/student-web/EventBasicInfo.vue

@@ -7,7 +7,7 @@
                     <span class="title-mark" v-show="info.type === 'Vote'" >{{$t("studentWeb.home.vote")}}</span>
                     <span class="title-mark" v-show="info.type === 'Survey'" >{{$t("studentWeb.home.survey")}}</span>
                     <span class="title-mark" v-show="info.type === 'Homework'" >{{$t("studentWeb.home.homework")}}</span>
-                    <span class="title-mark" v-show="from === 'hiteach'" >{{$t("studentWeb.hiteachview-title")}}</span>
+                    <span class="title-mark" v-show="from === 'hiteach'" >{{$t("studentWeb.hiteachviewTitle")}}</span>
                     {{ info.name }}
                 </h2>
             </i-col>

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventView.vue

@@ -29,7 +29,7 @@
             };
         },
         created() {
-            this.MyName = this.$t("studentWeb.eventView-title");
+            this.MyName = this.$t("studentWeb.eventViewTitle");
             this.$emit("onNavNo", this.MyNo);
             this.$emit("onNavName", this.MyName);
             this.$store.commit("ToggleSidebar", true);

TEAMModelOS/ClientApp/src/components/student-web/HiteachView/HiteachView.vue

@@ -687,7 +687,7 @@ export default {
 
         this.getList()
         //發送本頁target 跟名字給App.Vue 的navBar
-        this.MyName = this.$t("studentWeb.hiteachview-title")
+        this.MyName = this.$t("studentWeb.hiteachviewTitle")
         this.$emit("onNavNo", this.MyNo)
         this.$emit("onNavName", this.MyName)
         this.$store.commit("ToggleSidebar", true)

TEAMModelOS/ClientApp/src/components/student-web/HomeView/CourseListView.vue

@@ -284,7 +284,7 @@
 
             <p style="margin-bottom: 20px; font-weight: bold;">{{ $t("studentWeb.courseContent.classroom") }}：{{ baseInfo.roomName }}</p>
 
-            <!-- <h4 class="basic-title">{{ $t("studentWeb.courseContent.co-teacher") }}</h4> -->
+            <!-- <h4 class="basic-title">{{ $t("studentWeb.courseContent.coTeacher") }}</h4> -->
             <p style="margin-bottom: 20px; font-weight: bold;">{{ $t("studentWeb.courseContent.addedTime") }}：{{ baseInfo.courseAddDate }}</p>
         </Modal>
         <Modal v-model="showStuList" :title="$t('studentWeb.courseContent.nameList')" width="800">
@@ -463,7 +463,7 @@ export default {
     data(vm) {
         return {
             MyNo: "2",
-            MyName: this.$t('studentWeb.courseList-title'),
+            MyName: this.$t('studentWeb.courseListTitle'),
             isShow: false,
             period: [], //年级列表
             isLoad: false,

TEAMModelOS/ClientApp/src/components/student-web/HomeView/HomeView.vue

@@ -622,7 +622,7 @@ export default {
     },
 
     created() {
-        (this.MyName = this.$t("studentWeb.homeView-title")),
+        (this.MyName = this.$t("studentWeb.homeViewTitle")),
         this.$emit("onNavNo", this.MyNo)
         this.$emit("onNavName", this.MyName)
         this.getActivityInfo()

TEAMModelOS/ClientApp/src/components/student-web/HomeView/HomeViewnnnnew.vue

@@ -260,7 +260,7 @@ export default {
         }
     },
     mounted () {
-        this.MyName = this.$t("studentWeb.homeView-title")
+        this.MyName = this.$t("studentWeb.homeViewTitle")
         this.$emit("onNavNo", this.MyNo)
         this.$emit("onNavName", this.MyName)
         this.getGroupList()

TEAMModelOS/ClientApp/src/components/student-web/HomeView/SchoolCalendar.vue

@@ -367,7 +367,7 @@ export default {
       isClickDate: false,
       windowHeight: window.innerHeight - 75,
       MyNo: "X",
-      MyName: this.$t("studentWeb.calendar-title"),
+      MyName: this.$t("studentWeb.calendarTitle"),
       //行事曆
       calendar: {
         year: 0,

TEAMModelOS/ClientApp/src/components/student-web/HomeView/newHomeView.vue

@@ -785,7 +785,7 @@ export default {
     },
 
     created() {
-        (this.MyName = this.$t("studentWeb.homeView-title")),
+        (this.MyName = this.$t("studentWeb.homeViewTitle")),
         this.$emit("onNavNo", this.MyNo)
         this.$emit("onNavName", this.MyName)
         if(this.$store.getters.getChoseDate) {

TEAMModelOS/ClientApp/src/components/student-web/InformView/InformView.vue

@@ -41,7 +41,7 @@ export default {
       this.mockdata = mockdata.eventList;
     } else this.mockdata = mockdataEn.eventList;
 
-    this.MyName = this.$t("studentWeb.informview-title");
+    this.MyName = this.$t("studentWeb.informviewTitle");
     this.$emit("onNavNo", this.MyNo);
     this.$emit("onNavName", this.MyName);
     this.$store.commit("ToggleSidebar", true);

TEAMModelOS/ClientApp/src/components/student-web/SettingView/Setting.vue

@@ -52,7 +52,7 @@
                     </span>
                 </div>
                 <div class="setting-type">
-                    <p>{{ $t('studentWeb.tmManagement.e-mail') }}：</p>
+                    <p>{{ $t('studentWeb.tmManagement.Email') }}：</p>
                     <p>{{ stuInfo.mail ? stuInfo.mail : $t('studentWeb.tmManagement.noset') }}</p>
                     <span>
                         <Icon type="md-create" @click="changeSet('email')" :title="$t('studentWeb.tmManagement.edit')" />
@@ -133,7 +133,7 @@
                 <div v-show="setType == 'email'">
                     <Form ref="mail" :model="newEmail" :rules="mailValidate" :label-width="80" label-position="right">
                         <FormItem prop="mail">
-                            <span slot="label" class="form-label">{{ $t('studentWeb.tmManagement.e-mail') }}</span>
+                            <span slot="label" class="form-label">{{ $t('studentWeb.tmManagement.Email') }}</span>
                             <Input v-special-char v-model="newEmail.mail" class="edit-pw-input" />
                         </FormItem>
                         <FormItem prop="code" class="custom-radirs" v-if="!student">

TEAMModelOS/ClientApp/src/components/student-web/SettingView/SettingView.vue

@@ -19,14 +19,14 @@
                         :class="{ 'list-item-selected': currentTab == 2 }"
                         @click="setTab(2)"
                     >
-                        {{ $t("studentWeb.preference.page-title") }}
+                        {{ $t("studentWeb.preference.pageTitle") }}
                     </li>
                     <li
                         class="list-item"
                         :class="{ 'list-item-selected': currentTab == 3 }"
                         @click="setTab(3)"
                     >
-                        {{ $t("studentWeb.change-school.page-title") }}
+                        {{ $t("studentWeb.changeSchool.pageTitle") }}
                     </li>
                 </ul>
             </i-col>
@@ -191,7 +191,7 @@
                     </Row>
                 </div>
                 <div v-if="currentTab == 2">
-                    <h4>{{ $t("studentWeb.preference.UI-theme") }}</h4>
+                    <h4>{{ $t("studentWeb.preference.UITheme") }}</h4>
                     <label class="testBtn yesNoBtn">
                         <input type="radio" value="Light" v-model="uiType" />
                         <div class="lightbg"></div>
@@ -251,14 +251,14 @@
                 </div>
                 <div v-if="currentTab == 3">
                     <h4>
-                        {{ $t("studentWeb.change-school.current-data-school") }}
+                        {{ $t("studentWeb.changeSchool.currentDataSchool") }}
                     </h4>
 
                     <Dropdown class="dropdown">
                         <a href="javascript:void(0)">
                             {{
                                 $t(
-                                    "studentWeb.change-school.Habook-smart-school"
+                                    "studentWeb.changeSchool.HabookSmartSchool"
                                 )
                             }}
                             <Icon type="ios-arrow-down"></Icon>
@@ -266,7 +266,7 @@
                         <DropdownMenu slot="list">
                             <DropdownItem>{{
                                 $t(
-                                    "studentWeb.change-school.Habook-smart-school"
+                                    "studentWeb.changeSchool.HabookSmartSchool"
                                 )
                             }}</DropdownItem>
                         </DropdownMenu>

TEAMModelOS/ClientApp/src/components/student-web/StudyView/StudyList.vue

@@ -37,7 +37,7 @@
             </li>
             <li class="list-item-info list-item-infonofeedback">
               <p class="list-item-title" :class="{'list-item-titleEn':getCurrentLang()=='en'}">
-                <span class="list-item-typeMark">{{$t('studentWeb.studyview-title')}}</span>
+                <span class="list-item-typeMark">{{$t('studentWeb.studyviewTitle')}}</span>
 
                 <span>{{ item.eventName }}</span>
               </p>

TEAMModelOS/ClientApp/src/components/student-web/StudyView/StudyView.vue

@@ -90,7 +90,7 @@ export default {
       this.mockdata = mockdata.eventList;
     } else this.mockdata = mockdataEn.eventList;
     //發送本頁target 跟名字給App.Vue 的navBar
-    this.MyName = this.$t("studentWeb.studyview-title");
+    this.MyName = this.$t("studentWeb.studyviewTitle");
     this.$emit("onNavNo", this.MyNo);
     this.$emit("onNavName", this.MyName);
     this.$store.commit("ToggleSidebar", true);

TEAMModelOS/ClientApp/src/view/student-web/App.vue

@@ -91,7 +91,7 @@
                     <svg-icon icon-class="test" class="tabIcon2" />
                     <span v-show="MyNo != 5">{{ $t('studentWeb.type.exam') }}</span>
                 </MenuItem>
-                <MenuItem name="2" to="/studentWeb/courseList" :title="$t('studentWeb.courseList-title')">
+                <MenuItem name="2" to="/studentWeb/courseList" :title="$t('studentWeb.courseListTitle')">
                     <svg-icon icon-class="course" class="tabIcon5" />
                     <span v-show="MyNo != 2">{{ $t('studentWeb.course') }}</span>
                 </MenuItem>
@@ -227,7 +227,7 @@
             },
             getNavName: function (MyName) {
                 this.MyName = MyName;
-                if(MyName == this.$t("studentWeb.courseList-title") || MyName == this.$t("studentWeb.homeView-title")) {
+                if(MyName == this.$t("studentWeb.courseListTitle") || MyName == this.$t("studentWeb.homeViewTitle")) {
                     this.isAddClass = true
                 } else {
                     this.isAddClass = false

TEAMModelOS/ClientApp/src/view/student-web/AppNew.vue

@@ -20,7 +20,7 @@
           <svg-icon icon-class="home" class="tabIcon2" />
           <span class="no-show" v-show="MyNo != 1">{{ $t('studentWeb.type.home') }}</span>
           </MenuItem>
-          <MenuItem name="2" to="/studentWeb/courseList" :title="$t('studentWeb.courseList-title')">
+          <MenuItem name="2" to="/studentWeb/courseList" :title="$t('studentWeb.courseListTitle')">
           <svg-icon icon-class="course" class="tabIcon1" />
           <span class="no-show" v-show="MyNo != 2">{{ $t('studentWeb.course') }}</span>
           </MenuItem>
@@ -217,7 +217,7 @@ export default {
     },
     getNavName: function (MyName) {
       this.MyName = MyName;
-      if (MyName == this.$t("studentWeb.courseList-title") || MyName == this.$t("studentWeb.homeView-title")) {
+      if (MyName == this.$t("studentWeb.courseListTitle") || MyName == this.$t("studentWeb.homeViewTitle")) {
         this.isAddClass = true
       } else {
         this.isAddClass = false