diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 424207ee1..c31aef492 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("9.6.0.0")] -[assembly: AssemblyFileVersion("9.6.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("9.7.0.0")] +[assembly: AssemblyFileVersion("9.7.0.0")] \ No newline at end of file diff --git a/Project/Source/Forms/Boxes/Boards/CelebrationVersesBoardForm.cs b/Project/Source/Forms/Boxes/Boards/CelebrationVersesBoardForm.cs index cfacf8af2..864646761 100644 --- a/Project/Source/Forms/Boxes/Boards/CelebrationVersesBoardForm.cs +++ b/Project/Source/Forms/Boxes/Boards/CelebrationVersesBoardForm.cs @@ -98,6 +98,7 @@ private void CelebrationVersesBoardForm_Load(object sender, EventArgs e) private void PopulateLists() { var items = Enums.GetValues() + .Skip(1) .Select(value => new ListViewItem(AppTranslations.TorahCelebrations.GetLang(value)) { Tag = value }); SelectCelebration.Items.Clear(); SelectCelebration.Items.AddRange(items.ToArray()); @@ -109,9 +110,15 @@ private void FindCurrentCelebration(TorahCelebrationDay celebration = TorahCeleb if ( celebration == TorahCelebrationDay.None ) { var dateStart = DateTime.Today; - var day = ApplicationDatabase.Instance.LunisolarDays.FirstOrDefault(d => d.Date >= dateStart && d.HasTorahEvent); + var day = ApplicationDatabase.Instance + .LunisolarDays + .FirstOrDefault(d => d.Date >= dateStart + && d.HasTorahEvent + && d.TorahEvent != TorahCelebrationDay.NewYearD1); if ( day != null ) celebration = day.TorahEvent; } + if ( celebration == TorahCelebrationDay.NewYearD10 ) + celebration = TorahCelebrationDay.PessahD1; if ( celebration != TorahCelebrationDay.None ) { foreach ( ListViewItem item in SelectCelebration.Items ) diff --git a/README.md b/README.md index 81eb13630..73ff1ec42 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,10 @@ The generation of parashot relating to Shabatot is not guaranteed to be traditio ## Changelog +#### 2021.10.02 - Version 9.7 + +- Fix a bug introduced in previous version for the celebration verses board. + #### 2021.09.29 - Version 9.6 - Add option to show current celebration in the title bar. diff --git a/Setup/OrdisoftwareHebrewCalendarSetup.iss b/Setup/OrdisoftwareHebrewCalendarSetup.iss index ad2ed401c..2feccdd5c 100644 --- a/Setup/OrdisoftwareHebrewCalendarSetup.iss +++ b/Setup/OrdisoftwareHebrewCalendarSetup.iss @@ -1,4 +1,4 @@ -#define MyAppVersion "9.6" +#define MyAppVersion "9.7" #define MyAppName "Hebrew Calendar" #define MyAppNameNoSpace "HebrewCalendar" #define MyAppExeName "Ordisoftware.Hebrew.Calendar.exe"