Skip to content

Commit 4acb0f5

Browse files
committed
requested changes
1 parent 3014b32 commit 4acb0f5

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

Core/Core/Assignments/AssignmentList/View/AssignmentGroupView.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public struct AssignmentGroupView: View {
4646
.listRowSeparator(.hidden)
4747
}
4848

49-
@ViewBuilder
5049
private func headerView() -> some View {
5150
Button {
5251
isExpanded.toggle()

Core/Core/Assignments/AssignmentList/View/AssignmentListScreen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public struct AssignmentListScreen: View, ScreenViewTrackable {
6868
return Section(
6969
header: ListSectionHeaderOld(backgroundColor: .backgroundLightest) {
7070
HStack {
71-
Text("Grading Period:")
71+
Text("Grading Period:", bundle: .core)
7272
.font(.regular14)
7373
.fontWeight(.light)
7474
Spacer()

Core/Core/Assignments/AssignmentList/ViewModel/AssignmentListPreferencesViewModel.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,25 @@ public struct AssignmentFilterOption: CaseIterable, Equatable {
3939

4040
static let notYetSubmitted = Self(
4141
id: "notYetSubmitted",
42-
title: "Not Yet Submitted",
43-
subtitle: "Missing, Not Submitted",
42+
title: String(localized: "Not Yet Submitted", bundle: .core),
43+
subtitle: String(localized: "Missing, Not Submitted", bundle: .core),
4444
submissionRule: { submission in
4545
submission.missing && submission.submittedAt == nil
4646
}
4747
)
4848

4949
static let toBeGraded = Self(
5050
id: "toBeGraded",
51-
title: "To Be Graded",
52-
subtitle: "Late, Submitted",
51+
title: String(localized: "To Be Graded", bundle: .core),
52+
subtitle: String(localized: "Late, Submitted", bundle: .core),
5353
submissionRule: { submission in
5454
submission.late && submission.submittedAt != nil
5555
}
5656
)
5757

5858
static let graded = Self(
5959
id: "graded",
60-
title: "Graded",
60+
title: String(localized: "Graded", bundle: .core),
6161
submissionRule: { submission in
6262
submission.gradedAt != nil
6363
}

Core/Core/Assignments/AssignmentList/ViewModel/AssignmentListViewModel.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class AssignmentListViewModel: ObservableObject {
7777
equals: courseID,
7878
orderBy: #keyPath(GradingPeriod.startDate)
7979
)
80-
return env.subscribe(LocalUseCase(scope: scope)) { }
80+
return env.subscribe(LocalUseCase(scope: scope))
8181
}()
8282

8383
private lazy var assignmentGroups = env.subscribe(
@@ -115,7 +115,9 @@ public class AssignmentListViewModel: ObservableObject {
115115
sortingOption: AssignmentArrangementOptions? = nil,
116116
gradingPeriod: GradingPeriod?
117117
) {
118-
if gradingPeriod == selectedGradingPeriod && sortingOption == selectedSortingOption && filterOptions == selectedFilterOptions {
118+
if gradingPeriod == selectedGradingPeriod
119+
&& sortingOption == selectedSortingOption
120+
&& filterOptions == selectedFilterOptions {
119121
return
120122
}
121123

Core/Core/Localizable.xcstrings

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179599,6 +179599,9 @@
179599179599
}
179600179600
}
179601179601
}
179602+
},
179603+
"Late, Submitted" : {
179604+
179602179605
},
179603179606
"Latest" : {
179604179607
"localizations" : {
@@ -198102,6 +198105,9 @@
198102198105
}
198103198106
}
198104198107
}
198108+
},
198109+
"Missing, Not Submitted" : {
198110+
198105198111
},
198106198112
"Module and all Items published" : {
198107198113
"localizations" : {
@@ -216535,6 +216541,9 @@
216535216541
}
216536216542
}
216537216543
}
216544+
},
216545+
"Not Yet Submitted" : {
216546+
216538216547
},
216539216548
"Note" : {
216540216549
"localizations" : {
@@ -328168,6 +328177,9 @@
328168328177
}
328169328178
}
328170328179
}
328180+
},
328181+
"To Be Graded" : {
328182+
328171328183
},
328172328184
"To create an account, have your student create a pairing code for you from the Settings section of the Canvas Student app as shown below, and then scan that code from here.\nIf your student doesn't see the option to create a pairing code, you'll need to reach out to your school to create your account." : {
328173328185
"localizations" : {

0 commit comments

Comments
 (0)