Use weedays instead of day 1/2

mttcrsp · Jan 10, 2025 · 652a200 · 652a200
1 parent 1a69c07
commit 652a200
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/App/Resources/en.lproj/Localizable.strings b/App/Resources/en.lproj/Localizable.strings
@@ -97,13 +97,11 @@
 // A button that lets the user filter a list of tracks
 "search.filter.title" = "Filters";
 // Title for a section showing all tracks
-"search.filter.day" = "Day %d";
-// Title for a section showing tracks for a given day
 "search.filter.all" = "All tracks";
 // Title for a context menu that lets the user choose how to filter the list of tracks
 "search.filter.menu.title" = "Show";
 // A button that lets the user filter the list of all tracks by displaying only the ones for a given day
-"search.filter.menu.action.day" = "Only day %d";
+"search.filter.menu.action.day" = "Only %@";
 // A button that forces display of all tracks
 "search.filter.menu.action.all" = "All tracks";
 // Title for a section containing the user favorite tracks

diff --git a/App/Sources/Extensions/DateFormatter+Extensions.swift b/App/Sources/Extensions/DateFormatter+Extensions.swift
@@ -12,4 +12,10 @@ extension DateFormatter {
     formatter.dateFormat = "EEEE"
     return formatter
   }()
+
+  static var weekdayWithShortDate: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.dateFormat = "EEEE, d MMMM"
+    return formatter
+  }()
 }
diff --git a/App/Sources/Models/TracksFilter.swift b/App/Sources/Models/TracksFilter.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 enum TracksFilter: Equatable, Hashable {
-  case all, day(Int)
+  case all, day(Date)
 }
 
 extension TracksFilter: Comparable {
@@ -22,26 +22,26 @@ extension TracksFilter {
     switch self {
     case .all:
       L10n.Search.Filter.all
-    case let .day(day):
-      L10n.Search.Filter.day(day)
+    case let .day(date):
+      DateFormatter.weekdayWithShortDate.string(from: date)
     }
   }
 
   var action: String {
     switch self {
     case .all:
       L10n.Search.Filter.Menu.Action.all
-    case let .day(day):
-      L10n.Search.Filter.Menu.Action.day(day)
+    case let .day(date):
+      L10n.Search.Filter.Menu.Action.day(DateFormatter.weekday.string(from: date))
     }
   }
 
   var accessibilityIdentifier: String {
     switch self {
     case .all:
       "all"
-    case let .day(index):
-      "day \(index)"
+    case let .day(date):
+      "\(date)"
     }
   }
 }
diff --git a/App/Sources/Services/TracksService.swift b/App/Sources/Services/TracksService.swift
@@ -26,7 +26,7 @@ final class TracksService {
       var filters: Set<TracksFilter> = [.all]
 
       for (offset, track) in tracks.enumerated() {
-        let filter = TracksFilter.day(track.day)
+        let filter = TracksFilter.day(track.date)
         filters.insert(filter)
         configuration.filteredTracks[.all, default: []].append(track)
         configuration.filteredTracks[filter, default: []].append(track)