Skip to content

Display completedAt as yyyy/MM/dd HH:mm regardless of locale #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dadachi merged 1 commit into from
Apr 26, 2026
Merged

Display completedAt as yyyy/MM/dd HH:mm regardless of locale #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NativeAppTemplate/Extensions/Date+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ extension Date {
return formatter.string(from: self)
}

var cardDateTimeString: String {
"\(cardDateString) \(cardTimeString)"
}

var cardTimeAgoInWordsDateString: String {
let formatter = DateFormatter.timeAgoInWordsDateFormatter
return formatter.string(from: self)
Expand Down
3 changes: 2 additions & 1 deletion NativeAppTemplate/Extensions/DateFormatter+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import Foundation

extension String {
static let cardDateString: String = "MMM dd yyyy"
static let cardDateString: String = "yyyy/MM/dd"
static let cardTimeString: String = "HH:mm"
}

Expand Down Expand Up @@ -49,6 +49,7 @@ extension DateFormatter {
static func formatter(for dateString: String) -> DateFormatter {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = dateString
dateFormatter.locale = Locale(identifier: "en_US_POSIX")
return dateFormatter
}
}
2 changes: 1 addition & 1 deletion NativeAppTemplate/UI/Shop Detail/ShopDetailCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct ShopDetailCardView: View {
CompletedTag()

if let completedAt = itemTag.completedAt {
Text(completedAt.cardTimeString)
Text(completedAt.cardDateTimeString)
.font(.uiFootnote)
.foregroundStyle(.contentText)
}
Expand Down
2 changes: 1 addition & 1 deletion NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private extension ItemTagDetailView {
Text(String.completedAtLabel)
.font(.uiFootnote)
.foregroundStyle(.contentText)
Text(completedAt.formatted())
Text(completedAt.cardDateTimeString)
.font(.uiFootnote)
.foregroundStyle(.contentText)
}
Expand Down
2 changes: 1 addition & 1 deletion NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct ItemTagListCardView: View {
if itemTag.state == .completed {
CompletedTag()
if let completedAt = itemTag.completedAt {
Text(completedAt.cardTimeString)
Text(completedAt.cardDateTimeString)
.font(.uiFootnote)
.foregroundStyle(.contentText)
}
Expand Down
Loading