Merge branch 'development' into translations_src-assets-locales-ja-json--development_zh_TW

Author: MaySoMusician

src/assets/locales/en.json

@@ -24,8 +24,8 @@
         "title": "Tittle",
         "subject_name": "Course Tittle",
         "textbook": "Course Book",
-        "goal": "Objective of Learning",
-        "description": "Detail",
+        "goal": "Target",
+        "description": "Content",
         "videos": "Reference Video",
         "materials": "Learning Materials"
       },
@@ -69,7 +69,6 @@
         "date": "Date Setting",
         "time": "Time Setting",
         "subject_label_color": "Label Color",
-        "description": "Detailed Description",
         "video_keyword": "(Optional function) Video Search",
         "video_url": "Reference Video URL",
         "video_thumbnail": "Video Thumbnail/Caption Display",
@@ -80,7 +79,12 @@
       "placeholders": {
         "video_keyword": "EX) Science"
       },
-      "required": "*Items Marked with Are Required"
+      "required": "*Items Marked with Are Required",
+      "search_videos": {
+        "search": "Search",
+        "search_result": "Video Search Results of {source}",
+        "add_to_video_urls": "Reference Video URL"
+      }
     },
     "editing_visibility_dialog": {
       "title": {

src/assets/locales/ja.json

@@ -69,7 +69,6 @@
         "date": "日付設定",
         "time": "時間設定",
         "subject_label_color": "ラベル色",
-        "description": "内容（ないよう）",
         "video_keyword": "（オプション機能）動画検索",
         "video_url": "参考動画URL",
         "video_thumbnail": "動画サムネイル・キャプション表示",
@@ -80,7 +79,12 @@
       "placeholders": {
         "video_keyword": "例） 理科"
       },
-      "required": "*マークのあるものは必須項目です"
+      "required": "*マークのあるものは必須項目です",
+      "search_videos": {
+        "search": "検索する",
+        "search_result": "{source}の動画検索結果",
+        "add_to_video_urls": "参考動画URLに登録する"
+      }
     },
     "editing_visibility_dialog": {
       "title": {

src/components/EditLessonScreenInner2.vue

@@ -6,7 +6,7 @@
     />
     <editor-textarea
       v-model="tempFormData.description"
-      :title="$t('components.editing_screen.labels.description')"
+      :title="$t('common.lesson_data.labels.description')"
     />
   </div>
 </template>

src/components/EditLessonScreenInner3.vue

@@ -13,10 +13,18 @@
       :placeholders="$t('components.editing_screen.placeholder.video_keyword')"
     />
 
-    <button class="Button" @click="handleVideoSearchWord">検索する</button>
+    <button class="Button" @click="handleVideoSearchWord">
+      {{ $t('components.editing_screen.search_videos.search') }}
+    </button>
 
     <div v-if="videoSearchResult.length > 0" class="SearchResult">
-      <h3>NHK For Schoolの動画検索結果</h3>
+      <h3>
+        {{
+          $t('components.editing_screen.search_videos.search_result', {
+            source: 'NHK For School',
+          })
+        }}
+      </h3>
       <ul>
         <li v-for="(v, i) in displayLists" :key="i" class="SearchResultItem">
           <component
@@ -42,7 +50,9 @@
             class="Button"
             @click="registerVideoUrl(v.videoUrl)"
           >
-            参考動画URLに登録する
+            {{
+              $t('components.editing_screen.search_videos.add_to_video_urls')
+            }}
           </button>
         </li>
       </ul>

src/pages/edit/index.vue

@@ -148,7 +148,7 @@ type DataType = {
   classData: typeof vxm.classData
   editingMode: boolean
   editingVisibilityMode: boolean
-  editPageValue: object
+  editPageValue: editPageValueType
   editVisibilityDialogValue: object
 }
 
@@ -158,6 +158,25 @@ type Computed = {
   lessonsGroupByPeriod: LessonsGroupedBy
 }
 
+type editPageValueType = {
+  isHidden: boolean
+  lessonId: string
+  date: string
+  startTime: string
+  endTime: string
+  title: string
+  subjectName: string
+  subjectColor: string
+  goal: string
+  description: string
+  videoUrl: string
+  videoTitle: string
+  videoThumbnailUrl: string
+  pages: string
+  materialsTitle: string
+  materialsUrl: string
+}
+
 const editPageValueDefault = {
   isHidden: false,
   lessonId: '',
@@ -218,6 +237,13 @@ export default Vue.extend({
       this.resetEditLessonScreen()
     },
     toggleScreen(): void {
+      const date =
+        this.editPageValue.date !== ''
+          ? this.editPageValue.date
+          : dayjs(vxm.app.currentDate).format('YYYY-MM-DD')
+      this.editPageValue = Object.assign({}, this.editPageValue, {
+        date,
+      })
       this.editingMode = !this.editingMode
     },
     closeModal(): void {

src/pages/user/classlist.vue

@@ -20,7 +20,9 @@
             <v-radio :value="item.classId">
               <template v-slot:label>
                 <span class="ClassList-Label">
-                  {{ item.schoolName }} {{ item.className }}
+                  {{ item.schoolName }} {{ item.className }} （{{
+                    item.classId
+                  }}）
                 </span>
               </template>
             </v-radio>