Merge branch 'development' into dev-370

Author: NEKOYASAN

src/assets/locales/en.json

@@ -70,12 +70,16 @@
         "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",
         "textbook_page": "Textbook Page",
         "material_title": "Learning Material Title",
         "material_url": "Learning Material URL"
       },
+      "placeholders": {
+        "video_keyword": "EX) Science"
+      },
       "required": "*Items Marked with Are Required"
     },
     "editing_visibility_dialog": {

src/assets/locales/ja.json

@@ -24,8 +24,8 @@
         "title": "タイトル",
         "subject_name": "教科名",
         "textbook": "教科書",
-        "goal": "学習の目的",
-        "description": "詳細",
+        "goal": "ねらい",
+        "description": "内容（ないよう）",
         "videos": "参考動画",
         "materials": "副教材"
       },
@@ -69,7 +69,7 @@
         "date": "日付設定",
         "time": "時間設定",
         "subject_label_color": "ラベル色",
-        "description": "詳細説明",
+        "description": "内容（ないよう）",
         "video_keyword": "（オプション機能）動画検索",
         "video_url": "参考動画URL",
         "video_thumbnail": "動画サムネイル・キャプション表示",

src/assets/locales/zh_TW.json

@@ -70,12 +70,16 @@
         "time": "設定時間",
         "subject_label_color": "標籤顏色",
         "description": "詳細說明",
+        "video_keyword": "可選功能（影片搜尋）",
         "video_url": "參考影片 URL",
         "video_thumbnail": "顯示影片縮圖",
         "textbook_page": "教科書頁",
         "material_title": "副教材標題",
         "material_url": "輔助教材 URL"
       },
+      "placeholders": {
+        "video_keyword": "例）理科"
+      },
       "required": "*符號者為必填項目"
     },
     "editing_visibility_dialog": {

src/components/EditLessonScreenInner1.vue

@@ -141,12 +141,6 @@
         @clickButton="endTimePickerOpen = true"
       />
     </div>
-    <editor-input-field-pickable
-      v-model="tempFormData.title"
-      :title="`${$t('common.lesson_data.labels.title')} *`"
-      :label="$t('common.lesson_data.labels.title')"
-      placeholder="例）理科"
-    />
     <div class="EditingScreen-Flex">
       <editor-input-field-pickable
         v-model="tempFormData.subjectName"
@@ -164,6 +158,12 @@
         @clickPickerButton="colorPickerOpen = true"
       />
     </div>
+    <editor-input-field-pickable
+      v-model="tempFormData.title"
+      :title="`${$t('common.lesson_data.labels.title')} *`"
+      :label="$t('common.lesson_data.labels.title')"
+      placeholder="例）理科"
+    />
   </div>
 </template>
 

src/pages/edit/index.vue

@@ -108,7 +108,9 @@
     </div>
     <edit-lesson-screen-bottom-sheet
       :message="
-        $t('pages.edit_index.add_or_edit_lesson', { className: '2年B組' })
+        $t('pages.edit_index.add_or_edit_lesson', {
+          className: classData.className,
+        })
       "
       :expanded="!editingMode"
       @clickAddButton="toggleScreen"

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>