Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

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

@@ -622,11 +622,11 @@ const LANG_EN_US = {
         stuClient: 'Web IRS No.',
         noCus: 'No course information yet',
         noList: 'No list data yet',
-        regulator: 'Channel management',
-        channelsize: 'Channel space',
-        discussClass: 'No. of oridinary observation lessons',
-        discussJoin: 'No. of oridinary lesson observation connections',
-        notAuthorized: 'No license found yet'
+        regulator: 'Channel Management',
+        channelsize: 'Channel Space',
+        discussClass: 'General DLO Classroom No.',
+        discussJoin: 'General DLO’s Sokrates app No.',
+        notAuthorized: 'Not authorized'
     },
     // 班级管理
     classMgmt: {
@@ -1078,7 +1078,7 @@ const LANG_EN_US = {
         cc7: 'Personal',
         cc8: 'No HiTeach CC access: You have not joined a school yet',
         cc9: 'No HiTeach CC access: The school has not yet purchased authorization',
-        cc10: "The number of CC lessons opened today has reached the upper limit of the school's authorized scale, and the function is temporarily unavailable. Please contact the school administrator for confirmation.",
+        cc10: "The number of CC used today has reached the school's authorization limit, so the function is temporarily unavailable. Please contact the school administrator for confirmation.",
         filterExp: 'About to expire',
 
         //ManageClass.vue

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

@@ -429,8 +429,8 @@ export default {
                 this.$Modal.warning({
                     render: (h, params) => {
                         return h("div", [
-                            h('p', {}, '今日登录人数已达学校规模上限，应用功能暂不可使用，请联系学校管理者确认。'),
-                            h('p', {}, '注：艺术评测可正常作答。')
+                            h('p', {}, this.$t("studentWeb.home.scale1")),
+                            h('p', {}, this.$t("studentWeb.home.scale2"))
                         ])
                     }
                 })