Merge branch 'development' into fix/196_bottom-sheet-title

Author: MaySoMusician

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/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>