From d9c259e0d5e1f6b9a161994f46bb79559bd4338b Mon Sep 17 00:00:00 2001 From: Samuel Engelman Date: Thu, 12 May 2022 21:29:06 -0400 Subject: [PATCH 1/2] Hebrew version of Lag Be'omer uses the Beis prefix regardless of what's used for other days. --- src/Zmanim/JewishCalendar/HebrewDateFormatter.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs b/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs index 3efa76b..a5ad184 100644 --- a/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs +++ b/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs @@ -448,7 +448,14 @@ public virtual string FormatOmer(DateTime dt) } if (hebrewFormat) { - return FormatHebrewNumber(omer) + " " + hebrewOmerPrefix + "\u05E2\u05D5\u05DE\u05E8"; + if (omer == 33) // if lag b'omer + { + return FormatHebrewNumber(omer) + " " + "\u05D1\u05E2\u05D5\u05DE\u05E8"; + } + else + { + return FormatHebrewNumber(omer) + " " + hebrewOmerPrefix + "\u05E2\u05D5\u05DE\u05E8"; + } } else { From 94482f0e4e785fb439a692f3a1ad13b42665415d Mon Sep 17 00:00:00 2001 From: Samuel Engelman Date: Mon, 16 May 2022 10:10:11 -0400 Subject: [PATCH 2/2] Fixed Hebrew Parshios constant Added FormatParsha function --- .../JewishCalendar/HebrewDateFormatter.cs | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs b/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs index a5ad184..00df752 100644 --- a/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs +++ b/src/Zmanim/JewishCalendar/HebrewDateFormatter.cs @@ -21,6 +21,7 @@ #if !NOHEBREWCALENDAR using System.Text; using System; +using static Zmanim.JewishCalendar.JewishCalendar; namespace Zmanim.JewishCalendar { @@ -287,7 +288,43 @@ public virtual string[] TransliteratedParshiosList /// /// Unicode list of Hebrew parshiyos. /// - private static readonly string[] hebrewParshiyos = { "\u05D1\u05E8\u05D0\u05E9\u05D9\u05EA", "\u05E0\u05D7", "\u05DC\u05DA \u05DC\u05DA", "\u05D5\u05D9\u05E8\u05D0", "\u05D7\u05D9\u05D9 \u05E9\u05E8\u05D4", "\u05EA\u05D5\u05DC\u05D3\u05D5\u05EA", "\u05D5\u05D9\u05E6\u05D0", "\u05D5\u05D9\u05E9\u05DC\u05D7", "\u05D5\u05D9\u05E9\u05D1", "\u05DE\u05E7\u05E5", "\u05D5\u05D9\u05D2\u05E9", "\u05D5\u05D9\u05D7\u05D9", "\u05E9\u05DE\u05D5\u05EA", "\u05D5\u05D0\u05E8\u05D0", "\u05D1\u05D0", "\u05D1\u05E9\u05DC\u05D7", "\u05D9\u05EA\u05E8\u05D5", "\u05DE\u05E9\u05E4\u05D8\u05D9\u05DD", "\u05EA\u05E8\u05D5\u05DE\u05D4", "\u05EA\u05E6\u05D5\u05D4", "\u05DB\u05D9 \u05EA\u05E9\u05D0", "\u05D5\u05D9\u05E7\u05D4\u05DC", "\u05E4\u05E7\u05D5\u05D3\u05D9", "\u05D5\u05D9\u05E7\u05E8\u05D0", "\u05E6\u05D5", "\u05E9\u05DE\u05D9\u05E0\u05D9", "\u05EA\u05D6\u05E8\u05D9\u05E2", "\u05DE\u05E6\u05E8\u05E2", "\u05D0\u05D7\u05E8\u05D9 \u05DE\u05D5\u05EA", "\u05E7\u05D3\u05D5\u05E9\u05D9\u05DD", "\u05D0\u05DE\u05D5\u05E8", "\u05D1\u05D4\u05E8", "\u05D1\u05D7\u05E7\u05EA\u05D9", "\u05D1\u05DE\u05D3\u05D1\u05E8", "\u05E0\u05E9\u05D0", "\u05D1\u05D4\u05E2\u05DC\u05EA\u05DA", "\u05E9\u05DC\u05D7 \u05DC\u05DA", "\u05E7\u05E8\u05D7", "\u05D7\u05D5\u05E7\u05EA", "\u05D1\u05DC\u05E7", "\u05E4\u05D9\u05E0\u05D7\u05E1", "\u05DE\u05D8\u05D5\u05EA", "\u05DE\u05E1\u05E2\u05D9", "\u05D3\u05D1\u05E8\u05D9\u05DD", "\u05D5\u05D0\u05EA\u05D7\u05E0\u05DF", "\u05E2\u05E7\u05D1", "\u05E8\u05D0\u05D4", "\u05E9\u05D5\u05E4\u05D8\u05D9\u05DD", "\u05DB\u05D9 \u05EA\u05E6\u05D0", "\u05DB\u05D9 \u05EA\u05D1\u05D5\u05D0", "\u05E0\u05D9\u05E6\u05D1\u05D9\u05DD", "\u05D5\u05D9\u05DC\u05DA", "\u05D4\u05D0\u05D6\u05D9\u05E0\u05D5", "\u05D5\u05D9\u05E7\u05D4\u05DC \u05E4\u05E7\u05D5\u05D3\u05D9", "\u05EA\u05D6\u05E8\u05D9\u05E2 \u05DE\u05E6\u05E8\u05E2", "\u05D0\u05D7\u05E8\u05D9 \u05DE\u05D5\u05EA \u05E7\u05D3\u05D5\u05E9\u05D9\u05DD", "\u05D1\u05D4\u05E8 \u05D1\u05D7\u05E7\u05EA\u05D9", "\u05D7\u05D5\u05E7\u05EA \u05D1\u05DC\u05E7", "\u05DE\u05D8\u05D5\u05EA \u05DE\u05E1\u05E2\u05D9", "\u05E0\u05D9\u05E6\u05D1\u05D9\u05DD \u05D5\u05D9\u05DC\u05DA" }; + private static readonly string[] hebrewParshiyos = { "", "\u05D1\u05E8\u05D0\u05E9\u05D9\u05EA", "\u05E0\u05D7", "\u05DC\u05DA \u05DC\u05DA", "\u05D5\u05D9\u05E8\u05D0", "\u05D7\u05D9\u05D9 \u05E9\u05E8\u05D4", "\u05EA\u05D5\u05DC\u05D3\u05D5\u05EA", "\u05D5\u05D9\u05E6\u05D0", "\u05D5\u05D9\u05E9\u05DC\u05D7", "\u05D5\u05D9\u05E9\u05D1", "\u05DE\u05E7\u05E5", "\u05D5\u05D9\u05D2\u05E9", "\u05D5\u05D9\u05D7\u05D9", "\u05E9\u05DE\u05D5\u05EA", "\u05D5\u05D0\u05E8\u05D0", "\u05D1\u05D0", "\u05D1\u05E9\u05DC\u05D7", "\u05D9\u05EA\u05E8\u05D5", "\u05DE\u05E9\u05E4\u05D8\u05D9\u05DD", "\u05EA\u05E8\u05D5\u05DE\u05D4", "\u05EA\u05E6\u05D5\u05D4", "\u05DB\u05D9 \u05EA\u05E9\u05D0", "\u05D5\u05D9\u05E7\u05D4\u05DC", "\u05E4\u05E7\u05D5\u05D3\u05D9", "\u05D5\u05D9\u05E7\u05E8\u05D0", "\u05E6\u05D5", "\u05E9\u05DE\u05D9\u05E0\u05D9", "\u05EA\u05D6\u05E8\u05D9\u05E2", "\u05DE\u05E6\u05E8\u05E2", "\u05D0\u05D7\u05E8\u05D9 \u05DE\u05D5\u05EA", "\u05E7\u05D3\u05D5\u05E9\u05D9\u05DD", "\u05D0\u05DE\u05D5\u05E8", "\u05D1\u05D4\u05E8", "\u05D1\u05D7\u05E7\u05EA\u05D9", "\u05D1\u05DE\u05D3\u05D1\u05E8", "\u05E0\u05E9\u05D0", "\u05D1\u05D4\u05E2\u05DC\u05EA\u05DA", "\u05E9\u05DC\u05D7 \u05DC\u05DA", "\u05E7\u05E8\u05D7", "\u05D7\u05D5\u05E7\u05EA", "\u05D1\u05DC\u05E7", "\u05E4\u05D9\u05E0\u05D7\u05E1", "\u05DE\u05D8\u05D5\u05EA", "\u05DE\u05E1\u05E2\u05D9", "\u05D3\u05D1\u05E8\u05D9\u05DD", "\u05D5\u05D0\u05EA\u05D7\u05E0\u05DF", "\u05E2\u05E7\u05D1", "\u05E8\u05D0\u05D4", "\u05E9\u05D5\u05E4\u05D8\u05D9\u05DD", "\u05DB\u05D9 \u05EA\u05E6\u05D0", "\u05DB\u05D9 \u05EA\u05D1\u05D5\u05D0", "\u05E0\u05E6\u05D1\u05D9\u05DD", "\u05D5\u05D9\u05DC\u05DA", "\u05D4\u05D0\u05D6\u05D9\u05E0\u05D5", "\u05D5\u05D6\u05D0\u05EA \u05D4\u05D1\u05E8\u05DB\u05D4", "\u05D5\u05D9\u05E7\u05D4\u05DC \u05E4\u05E7\u05D5\u05D3\u05D9", "\u05EA\u05D6\u05E8\u05D9\u05E2 \u05DE\u05E6\u05E8\u05E2", "\u05D0\u05D7\u05E8\u05D9 \u05DE\u05D5\u05EA \u05E7\u05D3\u05D5\u05E9\u05D9\u05DD", "\u05D1\u05D4\u05E8 \u05D1\u05D7\u05E7\u05EA\u05D9", "\u05D7\u05D5\u05E7\u05EA \u05D1\u05DC\u05E7", "\u05DE\u05D8\u05D5\u05EA \u05DE\u05E1\u05E2\u05D9", "\u05E0\u05D9\u05E6\u05D1\u05D9\u05DD \u05D5\u05D9\u05DC\u05DA" }; + + /// + /// Formats the parsha. If is set, it will display in Hebrew. Otherwise is will display in English. + /// + /// + /// the formatted parsha + /// + public virtual string FormatParsha(DateTime dt) + { + Parsha parsha = jewishCalendar.GetParshah(dt); + + return FormatParsha(parsha); + } + + /// + /// Formats the parsha. If is set, it will display in Hebrew. Otherwise is will display in English. + /// + /// + /// the formatted parsha + /// + public virtual string FormatParsha(Parsha parsha) + { + if (hebrewFormat) + { + return hebrewParshiyos[(int)parsha]; + } + else + { + return parsha.ToString(); + } + } + + public virtual string[] GetHebrewParshiyos() + { + return hebrewParshiyos; + } /// /// Unicode list of Hebrew days of week.