Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

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

@@ -268,19 +268,19 @@
             getVoteType() {
                 if(this.voteInfo != undefined) {
                     if(this.voteInfo.times == "once") {
-                        return "单次"
+                        return this.$t("studentWeb.vote.type.once")
                     }
                     else if(this.voteInfo.times == "day") {
-                        return "每日"
+                        return this.$t("studentWeb.vote.type.day")
                     }
                     else if(this.voteInfo.times == "week") {
-                        return "每周"
+                        return this.$t("studentWeb.vote.type.week")
                     }
                     else if(this.voteInfo.times == "month") {
-                        return "每月"
+                        return this.$t("studentWeb.vote.type.month")
                     }
                     else if(this.voteInfo.times == "year") {
-                        return "每年"
+                        return this.$t("studentWeb.vote.type.year")
                     }
                 }
             },

TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -256,6 +256,13 @@ export default {
         delOk: "删除",
         delCancel: "取消",
         delSuccess: "删除成功",
+        type: {
+            once: "单次",
+            day: "每日",
+            week: "每周",
+            month: "每月",
+            year: "每年",
+        },
     },
     homework: {
         homeworkUpload: 'Assignment Upload Area',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -256,6 +256,13 @@ export default {
         delOk: "删除",
         delCancel: "取消",
         delSuccess: "删除成功",
+        type: {
+            once: "单次",
+            day: "每日",
+            week: "每周",
+            month: "每月",
+            year: "每年",
+        },
     },
     homework: {
         homeworkUpload: '作业上传区',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -256,6 +256,13 @@ export default {
         delOk: "删除",
         delCancel: "取消",
         delSuccess: "删除成功",
+        type: {
+            once: "單次",
+            day: "每日",
+            week: "每週",
+            month: "每月",
+            year: "每年",
+        },
     },
     homework: {
         homeworkUpload: '作業上傳區',