Skip to content

fix: Manual entries now correctly parse local time #73

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
DylanDevelops merged 1 commit into from
Jan 28, 2026
Merged

fix: Manual entries now correctly parse local time #73

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
6 changes: 3 additions & 3 deletions cmd/entries/manual.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,15 @@ func parseDateTime(date, timeStr, dateLayout string) (time.Time, error) {
normalizedTime := normalizeAMPM(timeStr)
dateTime := fmt.Sprintf("%s %s", date, normalizedTime)

if dt, err := time.ParseInLocation(dateLayout + " 3:04 PM", dateTime, time.Local); err == nil {
if dt, err := time.ParseInLocation(dateLayout + " 3:04 PM", dateTime, settings.GetDisplayTimezone()); err == nil {
return dt, nil
}

if dt, err := time.ParseInLocation(dateLayout + " 03:04 PM", dateTime, time.Local); err == nil {
if dt, err := time.ParseInLocation(dateLayout + " 03:04 PM", dateTime, settings.GetDisplayTimezone()); err == nil {
return dt, nil
}

return time.ParseInLocation(dateLayout + " 15:04", dateTime, time.Local)
return time.ParseInLocation(dateLayout + " 15:04", dateTime, settings.GetDisplayTimezone())
}

func normalizeAMPM(input string) string {
Expand Down
6 changes: 3 additions & 3 deletions internal/settings/global_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ func (gc *GlobalConfig) Save() error {
return nil
}

// getDisplayTimezone returns the user's configured timezone or local timezone as fallback
func getDisplayTimezone() *time.Location {
// GetDisplayTimezone returns the user's configured timezone or local timezone as fallback
func GetDisplayTimezone() *time.Location {
cfg, err := LoadGlobalConfig()
if err != nil || cfg.Timezone == "" {
return time.Local
Expand All @@ -109,7 +109,7 @@ func getDisplayTimezone() *time.Location {

// toDisplayTime converts a UTC time to the user's display timezone
func toDisplayTime(t time.Time) time.Time {
return t.In(getDisplayTimezone())
return t.In(GetDisplayTimezone())
}

func FormatTime(t time.Time) string {
Expand Down