Merge pull request #8 from MaxBGreenberg/forupstream

zmanim should be printed earliest to latest
hebcal · Jan 30, 2024 · 7b39dcc · 7b39dcc
2 parents bf8a21d + 4827409
commit 7b39dcc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hebcal/candles.go b/hebcal/candles.go
@@ -247,10 +247,10 @@ func dailyZemanim(date hdate.HDate, opts *CalOptions) []event.CalEvent {
 		{"Misheyakir Machmir", z.MisheyakirMachmir()},
 		{"Dawn", z.Dawn()},
 		{"Sunrise", z.Sunrise()},
-		{"Kriat Shema, sof zeman", z.SofZmanShma()},
 		{"Kriat Shema, sof zeman (MGA)", z.SofZmanShmaMGA()},
-		{"Tefilah, sof zeman", z.SofZmanTfilla()},
+		{"Kriat Shema, sof zeman (GRA)", z.SofZmanShma()},
 		{"Tefilah, sof zeman (MGA)", z.SofZmanTfillaMGA()},
+		{"Tefilah, sof zeman (GRA)", z.SofZmanTfilla()},
 		{"Chatzot hayom", z.Chatzot()},
 		{"Mincha Gedolah", z.MinchaGedola()},
 		{"Mincha Ketanah", z.MinchaKetana()},

diff --git a/hebcal/hebcal_test.go b/hebcal/hebcal_test.go
@@ -421,10 +421,10 @@ func TestDailyZemanim(t *testing.T) {
 		"2021-11-27 Misheyakir Machmir: 05:54",
 		"2021-11-27 Dawn: 06:18",
 		"2021-11-27 Sunrise: 06:49",
-		"2021-11-27 Kriat Shema, sof zeman: 09:11",
 		"2021-11-27 Kriat Shema, sof zeman (MGA): 08:35",
-		"2021-11-27 Tefilah, sof zeman: 09:58",
+		"2021-11-27 Kriat Shema, sof zeman (GRA): 09:11",
 		"2021-11-27 Tefilah, sof zeman (MGA): 09:34",
+		"2021-11-27 Tefilah, sof zeman (GRA): 09:58",
 		"2021-11-27 Chatzot hayom: 11:33",
 		"2021-11-27 Mincha Gedolah: 11:57",
 		"2021-11-27 Mincha Ketanah: 14:19",