Merge pull request #1100 from Ordisoftware/dev

Dev
Ordisoftware · Mar 17, 2022 · 48c5b2f · 48c5b2f
2 parents 0b4ba39 + 79c062a
commit 48c5b2f
Show file tree

Hide file tree

Showing 7 changed files with 4,128 additions and 7,025 deletions.
diff --git a/Project/Source/Database/ApplicationDatabase.Generate.Omer.cs b/Project/Source/Database/ApplicationDatabase.Generate.Omer.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2021-12 </edited>
+/// <edited> 2022-03 </edited>
 namespace Ordisoftware.Hebrew.Calendar;
 
 partial class ApplicationDatabase
@@ -199,7 +199,7 @@ bool check(LunisolarDay row)
         monthMoon++;
       if ( monthMoon == TorahCelebrationSettings.YomsMonth )
       {
-        dayDate = calculate(dayDate, 0, TorahCelebrationDay.YomTerouah, false);
+        dayDate = calculate(dayDate, TorahCelebrationSettings.YomTerouahDay - 1, TorahCelebrationDay.YomTerouah, false);
         calculate(dayDate, TorahCelebrationSettings.YomHaKipourimDay - 1, TorahCelebrationDay.YomHaKipourim, false);
         dayDate = calculate(dayDate, TorahCelebrationSettings.SoukotStartDay - 1, TorahCelebrationDay.SoukotD1, false);
         calculate(dayDate, TorahCelebrationSettings.SoukotLenght - 1, TorahCelebrationDay.SoukotD8, false);

diff --git a/Project/Source/Enums/TorahCelebrationDay.cs b/Project/Source/Enums/TorahCelebrationDay.cs
@@ -38,37 +38,37 @@ public enum TorahCelebrationDay
   NewYearD10,
 
   /// <summary>
-  /// Pessah first day.
+  /// Pessa'h first day.
   /// </summary>
   PessahD1,
 
   /// <summary>
-  /// Pessah last day.
+  /// Pessa'h last day.
   /// </summary>
   PessahD7,
 
   /// <summary>
-  /// Chavouot diet start.
+  /// Shavou'ot diet start.
   /// </summary>
   ChavouotDiet,
 
   /// <summary>
-  /// Shavouot first celebration.
+  /// Shavou'ot first celebration.
   /// </summary>
   Chavouot1,
 
   /// <summary>
-  /// The Shavouot second celebration.
+  /// Shavou'ot second celebration.
   /// </summary>
   Chavouot2,
 
   /// <summary>
-  /// Yom terouah.
+  /// Yom Terou'ah.
   /// </summary>
   YomTerouah,
 
   /// <summary>
-  /// Yom hakipourim.
+  /// Yom HaKipourim.
   /// </summary>
   YomHaKipourim,
 

diff --git a/Project/Source/Enums/TorahCelebrationSettings.cs b/Project/Source/Enums/TorahCelebrationSettings.cs
@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2021-09 </edited>
+/// <edited> 2022-03 </edited>
 namespace Ordisoftware.Hebrew.Calendar;
 
 /// <summary>
@@ -21,87 +21,92 @@ static class TorahCelebrationSettings
 {
 
   /// <summary>
-  /// The pessah month.
+  /// Pessa'h month.
   /// </summary>
   static public readonly int PessahMonth = 1;
 
   /// <summary>
-  /// The spring lamb day.
+  /// Spring lamb day.
   /// </summary>
   static public readonly int NewLambDay = 10;
 
   /// <summary>
-  /// The pessah start day.
+  /// Pessa'h start day.
   /// </summary>
   static public readonly int PessahStartDay = 14;
 
   /// <summary>
-  /// The pessah length.
+  /// Pessa'h length.
   /// </summary>
   static public readonly int PessahLenght = 7;
 
   /// <summary>
-  /// The pessah last day.
+  /// Pessa'h last day.
   /// </summary>
   static public readonly int PessahEndDay = PessahStartDay + PessahLenght - 1;
 
   /// <summary>
-  /// The chavouot length.
+  /// Shavou'ot length.
   /// </summary>
   static public readonly int ChavouotLenght = 50;
 
   /// <summary>
-  /// The Yoms month.
+  /// Yoms month.
   /// </summary>
   static public readonly int YomsMonth = 7;
 
   /// <summary>
-  /// The hakipourim day.
+  /// Yom Terou'ah day.
+  /// </summary>
+  static public readonly int YomTerouahDay = 1;
+
+  /// <summary>
+  /// Yom HaKipourim day.
   /// </summary>
   static public readonly int YomHaKipourimDay = 10;
 
   /// <summary>
-  /// The soukot start day.
+  /// Soukot start day.
   /// </summary>
   static public readonly int SoukotStartDay = 15;
 
   /// <summary>
-  /// The soukot length.
+  /// Soukot length.
   /// </summary>
   static public readonly int SoukotLenght = 7 + 1;
 
   /// <summary>
-  /// The soukot last day.
+  /// Soukot last day.
   /// </summary>
   static public readonly int SoukotEndDay = SoukotStartDay + SoukotLenght - 1;
 
   /// <summary>
-  /// The 'hanouka month.
+  /// 'Hanouka month.
   /// </summary>
   static public readonly int HanoukaMonth = 9;
 
   /// <summary>
-  /// The 'hanouka day.
+  /// 'Hanouka day.
   /// </summary>
   static public readonly int HanoukaStartDay = 25;
 
   /// <summary>
-  /// The 'hanouka length.
+  /// 'Hanouka length.
   /// </summary>
   static public readonly int HanoukaLenght = 7 + 1;
 
   /// <summary>
-  /// The 'hanouka last day.
+  /// 'Hanouka last day.
   /// </summary>
   static public readonly int HanoukaEndDay = HanoukaStartDay + HanoukaEndDay - 1;
 
   /// <summary>
-  /// The pourim month.
+  /// Pourim month.
   /// </summary>
-  static public readonly int PourimMonth = 12;
+  static public readonly int PourimMonth = 12; // or 13 for a year with Adar II
 
   /// <summary>
-  /// The pourim day.
+  /// Pourim day.
   /// </summary>
   static public readonly int PourimDay = 14;