Skip to content

Commit

Permalink
Merge pull request #44 from Ordisoftware/dev
Browse files Browse the repository at this point in the history
Fix fill months
  • Loading branch information
Ordisoftware authored Jan 22, 2019
2 parents f47a72c + 583443e commit 03a3dbc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Project/Source/Classes/LocalizerHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static public readonly Dictionary<string, string> CantExitApplicationWhileGenera
= new Dictionary<string, string>()
{
{ "en", "Can't close while generating." },
{ "fr", "Impossibme de quitter durant la génération." }
{ "fr", "Impossible de quitter durant la génération." }
};

static public readonly Dictionary<string, string> GenerateCalendarText
Expand Down
4 changes: 2 additions & 2 deletions Project/Source/Forms/MainForm.FillMonths.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ void add(Color color, string text)
: ( row.IsFullMoon == 1 ? Color.DarkGoldenrod : Color.DarkBlue );
if ( (MoonriseType)row.MoonriseType == MoonriseType.AfterSet )
{
add(Color.Black, EphemerisNames.GetLang(EphemerisType.Set) + row.Moonset);
if ( row.Moonset != "" ) add(Color.Black, EphemerisNames.GetLang(EphemerisType.Set) + row.Moonset);
if ( (MoonriseType)row.MoonriseType != MoonriseType.NextDay )
add(colorMoon, EphemerisNames.GetLang(EphemerisType.Rise) + row.Moonrise + " #" + row.LunarDay + strMonth);
}
else
{
if ( (MoonriseType)row.MoonriseType != MoonriseType.NextDay )
add(colorMoon, EphemerisNames.GetLang(EphemerisType.Rise) + row.Moonrise + " #" + row.LunarDay + strMonth);
add(Color.Black, EphemerisNames.GetLang(EphemerisType.Set) + row.Moonset);
if ( row.Moonset != "" ) add(Color.Black, EphemerisNames.GetLang(EphemerisType.Set) + row.Moonset);
}
if ( row.SeasonChange != 0 )
add(Color.DarkGreen, TorahCelebrations.SeasonEventNames.GetLang((SeasonChangeType)row.SeasonChange));
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ A tool for Windows written in C# that allows to generate a daily calendar based
## Functionalities

- Generate a calendar with sun and moon rises and sets.
- Tabular text report view.
- Month view.
- Grid view.
- Tabular text report, month or grid view.
- Event reminder for shabat and celebrations.
- Search for a day in the database.
- Window listing annual celebrations.
Expand Down

0 comments on commit 03a3dbc

Please sign in to comment.