Skip to content

Commit ddbbd1d

Browse files
committed
fix: class change info window
1 parent aba2945 commit ddbbd1d

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

assets/flutter_i18n/zh_CN.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,13 @@ classtable:
102102
"7": ""
103103
change_class_message: 调课信息,从第{originalAffectedWeeks}周
104104
星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}节
105-
调整为第{newAffectedWeeksListStr}周星期{weekChar_newWeek}的
106-
{newClassRangeStart}-{newClassRangeStop}节,{newClassroom}教室上课
105+
调整为第{newAffectedWeeksListStr}周星期{weekChar_newWeek}的{newClassRangeStart}-{newClassRangeStop}节,{newClassroom}教室上课
107106
patch_class_message: 补课信息,第{newAffectedWeeksListStr}周
108107
星期{weekChar_newWeek}的{newClassRangeStart}-{newClassRangeStop}节,
109108
{newClassroom}补课
110109
stop_class_message: 停课信息,第{originalAffectedWeeks}周
111-
星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}节
112-
{originalClassroom}停课
113-
class_info: "编号: {classCode} | {classNumber} 班\n安排变更:{classChange}\n{teacherChange}"
110+
星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}节停课
111+
class_info: "编号: {classCode} | {classNumber} 班\n安排变更:{classChange}{teacherChange}"
114112
not_arranged_page:
115113
title: "没有时间安排的科目"
116114
empty_message: "目前全部课程均有时间安排"

assets/flutter_i18n/zh_TW.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,13 @@ classtable:
8484
'6':
8585
'7':
8686
change_class_message: 調課資訊,從第{originalAffectedWeeks}周 星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}節
87-
調整為第{newAffectedWeeksListStr}周星期{weekChar_newWeek}的 {newClassRangeStart}-{newClassRangeStop}節,{newClassroom}教室上課
87+
調整為第{newAffectedWeeksListStr}周星期{weekChar_newWeek}的{newClassRangeStart}-{newClassRangeStop}節,{newClassroom}教室上課
8888
patch_class_message: 補課資訊,第{newAffectedWeeksListStr}周 星期{weekChar_newWeek}的{newClassRangeStart}-{newClassRangeStop}節,
8989
{newClassroom}補課
90-
stop_class_message: 停課資訊,第{originalAffectedWeeks}周 星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}節
91-
{originalClassroom}停課
90+
stop_class_message: 停課資訊,第{originalAffectedWeeks}周 星期{weekChar_originalWeek}的{originalClassRangeStart}-{originalClassRangeEnd}節停課
9291
class_info: '編號: {classCode} | {classNumber} 班
9392
94-
安排變更:{classChange}
95-
96-
{teacherChange}'
93+
安排變更:{classChange}{teacherChange}'
9794
not_arranged_page:
9895
title: 沒有時間安排的科目
9996
empty_message: 目前全部課程均有時間安排

lib/page/classtable/class_page/class_change_list.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ class ClassChangeList extends StatelessWidget {
104104
"newClassRangeStart":
105105
toShow.newClassRange[0].toString(),
106106
"newClassRangeStop": toShow.newClassRange[1].toString(),
107-
"newClassroom": toShow.newClassroom.toString(),
107+
"newClassroom":
108+
(toShow.newClassroom ?? toShow.originalClassroom)
109+
.toString(),
108110
});
109111
break;
110112
case ChangeType.patch:
@@ -141,10 +143,10 @@ class ClassChangeList extends StatelessWidget {
141143
translationParams: {
142144
"classCode": classChanges[index].classCode,
143145
"classNumber": classChanges[index].classNumber,
144-
"classChange": classChange,
146+
"classChange": classChange.replaceAll(" ", ''),
145147
"teacherChange":
146148
classChanges[index].type == ChangeType.change
147-
? teacherChange
149+
? "\n$teacherChange"
148150
: "",
149151
}),
150152
),

0 commit comments

Comments
 (0)