Skip to content

Commit f5fd546

Browse files
NEKOYASANNEKOYASAN
authored
Merge branch 'development' into aws-migration
2 parents 34755df + 355a2d3 commit f5fd546

File tree

8 files changed

+85
-25
lines changed

8 files changed

+85
-25
lines changed

‎src/assets/locales/en.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"title": "Tittle",
2525
"subject_name": "Course Tittle",
2626
"textbook": "Course Book",
27-
"goal": "Objective of Learning",
28-
"description": "Detail",
27+
"goal": "Target",
28+
"description": "Content",
2929
"videos": "Reference Video",
3030
"materials": "Learning Materials"
3131
},
@@ -69,14 +69,22 @@
6969
"date": "Date Setting",
7070
"time": "Time Setting",
7171
"subject_label_color": "Label Color",
72-
"description": "Detailed Description",
72+
"video_keyword": "(Optional function) Video Search",
7373
"video_url": "Reference Video URL",
7474
"video_thumbnail": "Video Thumbnail/Caption Display",
7575
"textbook_page": "Textbook Page",
7676
"material_title": "Learning Material Title",
7777
"material_url": "Learning Material URL"
7878
},
79-
"required": "*Items Marked with Are Required"
79+
"placeholders": {
80+
"video_keyword": "EX) Science"
81+
},
82+
"required": "*Items Marked with Are Required",
83+
"search_videos": {
84+
"search": "Search",
85+
"search_result": "Video Search Results of {source}",
86+
"add_to_video_urls": "Reference Video URL"
87+
}
8088
},
8189
"editing_visibility_dialog": {
8290
"title": {

‎src/assets/locales/ja.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"title": "タイトル",
2525
"subject_name": "教科名",
2626
"textbook": "教科書",
27-
"goal": "学習の目的",
28-
"description": "詳細",
27+
"goal": "ねらい",
28+
"description": "内容（ないよう）",
2929
"videos": "参考動画",
3030
"materials": "副教材"
3131
},
@@ -69,7 +69,6 @@
6969
"date": "日付設定",
7070
"time": "時間設定",
7171
"subject_label_color": "ラベル色",
72-
"description": "詳細説明",
7372
"video_keyword": "（オプション機能）動画検索",
7473
"video_url": "参考動画URL",
7574
"video_thumbnail": "動画サムネイル・キャプション表示",
@@ -80,7 +79,12 @@
8079
"placeholders": {
8180
"video_keyword": "例） 理科"
8281
},
83-
"required": "*マークのあるものは必須項目です"
82+
"required": "*マークのあるものは必須項目です",
83+
"search_videos": {
84+
"search": "検索する",
85+
"search_result": "{source}の動画検索結果",
86+
"add_to_video_urls": "参考動画URLに登録する"
87+
}
8488
},
8589
"editing_visibility_dialog": {
8690
"title": {

‎src/assets/locales/zh_TW.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"title": "標題",
2525
"subject_name": "科目名",
2626
"textbook": "教科書",
27-
"goal": "學習目標",
28-
"description": "詳細",
27+
"goal": "目標",
28+
"description": "內容",
2929
"videos": "參考影片",
3030
"materials": "輔助教材"
3131
},
@@ -69,14 +69,22 @@
6969
"date": "設定日期",
7070
"time": "設定時間",
7171
"subject_label_color": "標籤顏色",
72-
"description": "詳細說明",
72+
"video_keyword": "可選功能（影片搜尋）",
7373
"video_url": "參考影片 URL",
7474
"video_thumbnail": "顯示影片縮圖",
7575
"textbook_page": "教科書頁",
7676
"material_title": "副教材標題",
7777
"material_url": "輔助教材 URL"
7878
},
79-
"required": "*符號者為必填項目"
79+
"placeholders": {
80+
"video_keyword": "例）理科"
81+
},
82+
"required": "*符號者為必填項目",
83+
"search_videos": {
84+
"search": "搜尋",
85+
"search_result": "{source}的影片搜尋結果",
86+
"add_to_video_urls": "參考影片 URL 登錄"
87+
}
8088
},
8189
"editing_visibility_dialog": {
8290
"title": {

‎src/components/EditLessonScreenInner1.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,6 @@
141141
@clickButton="endTimePickerOpen = true"
142142
/>
143143
</div>
144-
<editor-input-field-pickable
145-
v-model="tempFormData.title"
146-
:title="`${$t('common.lesson_data.labels.title')} *`"
147-
:label="$t('common.lesson_data.labels.title')"
148-
placeholder="例）理科"
149-
/>
150144
<div class="EditingScreen-Flex">
151145
<editor-input-field-pickable
152146
v-model="tempFormData.subjectName"
@@ -164,6 +158,12 @@
164158
@clickPickerButton="colorPickerOpen = true"
165159
/>
166160
</div>
161+
<editor-input-field-pickable
162+
v-model="tempFormData.title"
163+
:title="`${$t('common.lesson_data.labels.title')} *`"
164+
:label="$t('common.lesson_data.labels.title')"
165+
placeholder="例）理科"
166+
/>
167167
</div>
168168
</template>
169169

‎src/components/EditLessonScreenInner2.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/>
77
<editor-textarea
88
v-model="tempFormData.description"
9-
:title="$t('components.editing_screen.labels.description')"
9+
:title="$t('common.lesson_data.labels.description')"
1010
/>
1111
</div>
1212
</template>

‎src/components/EditLessonScreenInner3.vue‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@
1313
:placeholders="$t('components.editing_screen.placeholder.video_keyword')"
1414
/>
1515

16-
<button class="Button" @click="handleVideoSearchWord">検索する</button>
16+
<button class="Button" @click="handleVideoSearchWord">
17+
{{ $t('components.editing_screen.search_videos.search') }}
18+
</button>
1719

1820
<div v-if="videoSearchResult.length > 0" class="SearchResult">
19-
<h3>NHK For Schoolの動画検索結果</h3>
21+
<h3>
22+
{{
23+
$t('components.editing_screen.search_videos.search_result', {
24+
source: 'NHK For School',
25+
})
26+
}}
27+
</h3>
2028
<ul>
2129
<li v-for="(v, i) in displayLists" :key="i" class="SearchResultItem">
2230
<component
@@ -42,7 +50,9 @@
4250
class="Button"
4351
@click="registerVideoUrl(v.videoUrl)"
4452
>
45-
参考動画URLに登録する
53+
{{
54+
$t('components.editing_screen.search_videos.add_to_video_urls')
55+
}}
4656
</button>
4757
</li>
4858
</ul>

‎src/pages/edit/index.vue‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@
108108
</div>
109109
<edit-lesson-screen-bottom-sheet
110110
:message="
111-
$t('pages.edit_index.add_or_edit_lesson', { className: '2年B組' })
111+
$t('pages.edit_index.add_or_edit_lesson', {
112+
className: classData.className,
113+
})
112114
"
113115
:expanded="!editingMode"
114116
@clickAddButton="toggleScreen"
@@ -146,7 +148,7 @@ type DataType = {
146148
classData: typeof vxm.classData
147149
editingMode: boolean
148150
editingVisibilityMode: boolean
149-
editPageValue: object
151+
editPageValue: editPageValueType
150152
editVisibilityDialogValue: object
151153
}
152154
@@ -156,6 +158,25 @@ type Computed = {
156158
lessonsGroupByPeriod: LessonsGroupedBy
157159
}
158160
161+
type editPageValueType = {
162+
isHidden: boolean
163+
lessonId: string
164+
date: string
165+
startTime: string
166+
endTime: string
167+
title: string
168+
subjectName: string
169+
subjectColor: string
170+
goal: string
171+
description: string
172+
videoUrl: string
173+
videoTitle: string
174+
videoThumbnailUrl: string
175+
pages: string
176+
materialsTitle: string
177+
materialsUrl: string
178+
}
179+
159180
const editPageValueDefault = {
160181
isHidden: false,
161182
lessonId: '',
@@ -216,6 +237,13 @@ export default Vue.extend({
216237
this.resetEditLessonScreen()
217238
},
218239
toggleScreen(): void {
240+
const date =
241+
this.editPageValue.date !== ''
242+
? this.editPageValue.date
243+
: dayjs(vxm.app.currentDate).format('YYYY-MM-DD')
244+
this.editPageValue = Object.assign({}, this.editPageValue, {
245+
date,
246+
})
219247
this.editingMode = !this.editingMode
220248
},
221249
closeModal(): void {

‎src/pages/user/classlist.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<v-radio :value="item.classId">
2121
<template v-slot:label>
2222
<span class="ClassList-Label">
23-
{{ item.schoolName }} {{ item.className }}
23+
{{ item.schoolName }} {{ item.className }} （{{
24+
item.classId
25+
}}）
2426
</span>
2527
</template>
2628
</v-radio>

0 commit comments

Comments
 (0)