Skip to content

Feat/translate/sunrise sunset #20

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

Draft
chaimleib wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Feat/translate/sunrise sunset #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
605fd6d
chore(translations): update strings_ashkenazi.go
chaimleib Feb 18, 2026
daf5c5f
feat(translations): translate sunrise and sunset labels, make zmanim …
chaimleib Feb 18, 2026
3eed7f1
test(hebcal): de-dupe the event list checker loop, since SonarQube co…
chaimleib Feb 18, 2026
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
36 changes: 28 additions & 8 deletions hebcal/candles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"time"

"github.com/hebcal/hdate"

"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/locales"
"github.com/hebcal/hebcal-go/zmanim"
Expand All @@ -45,8 +46,15 @@ type TimedEvent struct {
opts *CalOptions
}

func NewTimedEvent(hd hdate.HDate, desc string, flags event.HolidayFlags, t time.Time,
sunsetOffset int, linkedEvent event.CalEvent, opts *CalOptions) TimedEvent {
func NewTimedEvent(
hd hdate.HDate,
desc string,
flags event.HolidayFlags,
t time.Time,
sunsetOffset int,
linkedEvent event.CalEvent,
opts *CalOptions,
) TimedEvent {
if t.IsZero() {
return TimedEvent{}
}
Expand Down Expand Up @@ -99,7 +107,11 @@ func (ev TimedEvent) Basename() string {
return ev.Desc
}

func makeCandleEvent(hd hdate.HDate, opts *CalOptions, ev event.CalEvent) TimedEvent {
func makeCandleEvent(
hd hdate.HDate,
opts *CalOptions,
ev event.CalEvent,
) TimedEvent {
havdalahTitle := false
useHavdalahOffset := false
dow := hd.Weekday()
Expand Down Expand Up @@ -146,7 +158,10 @@ func makeCandleEvent(hd hdate.HDate, opts *CalOptions, ev event.CalEvent) TimedE
return NewTimedEvent(hd, desc, flags, eventTime, offset, ev, opts)
}

func makeChanukahCandleLighting(ev event.HolidayEvent, opts *CalOptions) TimedEvent {
func makeChanukahCandleLighting(
ev event.HolidayEvent,
opts *CalOptions,
) TimedEvent {
hd := ev.Date
dow := hd.Weekday()
if dow == time.Friday || dow == time.Saturday {
Expand Down Expand Up @@ -174,7 +189,10 @@ func makeChanukahCandleLighting(ev event.HolidayEvent, opts *CalOptions) TimedEv
}
}

func makeFastStartEnd(ev event.CalEvent, opts *CalOptions) (TimedEvent, TimedEvent) {
func makeFastStartEnd(
ev event.CalEvent,
opts *CalOptions,
) (TimedEvent, TimedEvent) {
year, month, day := ev.GetDate().Greg()
gregDate := time.Date(year, month, day, 0, 0, 0, 0, time.UTC)
loc := opts.Location
Expand Down Expand Up @@ -218,7 +236,9 @@ func (ev riseSetEvent) Render(locale string) string {
set := z.Sunset()
riseStr := formatTime(&rise, ev.opts)
setStr := formatTime(&set, ev.opts)
return fmt.Sprintf("Sunrise: %s; Sunset %s", riseStr, setStr)
riseLabel, _ := locales.LookupTranslation("Sunrise", locale)
setLabel, _ := locales.LookupTranslation("Sunset", locale)
return fmt.Sprintf("%s: %s; %s: %s", riseLabel, riseStr, setLabel, setStr)
}

func (ev riseSetEvent) GetFlags() event.HolidayFlags {
Expand All @@ -242,15 +262,15 @@ func dailyZemanim(date hdate.HDate, opts *CalOptions) []event.CalEvent {
desc string
t time.Time
}{
{"Alot haShachar", z.AlotHaShachar()},
{"Alot HaShachar", z.AlotHaShachar()},
{"Misheyakir", z.Misheyakir()},
{"Misheyakir Machmir", z.MisheyakirMachmir()},
{"Sunrise", z.Sunrise()},
{"Kriat Shema, sof zeman (MGA)", z.SofZmanShmaMGA()},
{"Kriat Shema, sof zeman (GRA)", z.SofZmanShma()},
{"Tefilah, sof zeman (MGA)", z.SofZmanTfillaMGA()},
{"Tefilah, sof zeman (GRA)", z.SofZmanTfilla()},
{"Chatzot hayom", z.Chatzot()},
{"Chatzot HaYom", z.Chatzot()},
{"Mincha Gedolah", z.MinchaGedola()},
{"Mincha Ketanah", z.MinchaKetana()},
{"Plag HaMincha", z.PlagHaMincha()},
Expand Down
Loading