Skip to content

Commit e18bbcc

Browse files
committed
PublicHolidaysComplete renamed to PublicHolidaysInformation
1 parent 0dbbc8b commit e18bbcc

File tree

6 files changed

+217
-217
lines changed

6 files changed

+217
-217
lines changed

src/PublicHoliday/FrancePublicHoliday.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace PublicHoliday
77
/// <summary>
88
/// Finds France public holidays.
99
/// Public holidays on Sundays are not deferred to following weekday automatically-
10-
/// they may be taken at an arbitary date.
10+
/// they may be taken at an arbitrary date.
1111
/// https://fr.wikipedia.org/wiki/F%C3%AAtes_et_jours_f%C3%A9ri%C3%A9s_en_France#Tableau_r%C3%A9capitulatif
1212
/// </summary>
1313
public class FrancePublicHoliday : PublicHolidayBase
@@ -110,10 +110,8 @@ private static string GetRegionName(Regions region)
110110
{
111111
return name;
112112
}
113-
else
114-
{
115-
return string.Empty;
116-
}
113+
114+
return string.Empty;
117115
}
118116

119117
#endregion
@@ -1126,7 +1124,7 @@ public override bool IsPublicHoliday(DateTime dt)
11261124
/// </summary>
11271125
/// <param name="year">The given year</param>
11281126
/// <returns></returns>
1129-
public IList<Holiday> PublicHolidaysComplete(int year)
1127+
public override IList<Holiday> PublicHolidaysInformation(int year)
11301128
{
11311129
// avoids having to recalculate it each time for different public holidays :
11321130
DateTime easter = HolidayCalculator.GetEaster(year);

src/PublicHoliday/PortugalPublicHoliday.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace PublicHoliday
66
{
7+
/// <summary>
8+
/// Portugal public holidays. Set <see cref="Region"/> for autonomous regions.
9+
/// </summary>
710
public class PortugalPublicHoliday : PublicHolidayBase
811
{
912
#region Regions
@@ -119,7 +122,7 @@ private static DateTime GoodFriday(DateTime easter)
119122
return easter.AddDays(-2);
120123
}
121124

122-
private Holiday GoodFridayHoliday(DateTime easter)
125+
private static Holiday GoodFridayHoliday(DateTime easter)
123126
{
124127
DateTime holiday = GoodFriday(easter);
125128
return new Holiday(holiday, "Good Friday", "Sexta-feira Santa");
@@ -139,7 +142,7 @@ public static DateTime Easter(int year)
139142
return HolidayCalculator.GetEaster(year);
140143
}
141144

142-
private Holiday EasterHoliday(int year)
145+
private static Holiday EasterHoliday(int year)
143146
{
144147
DateTime holiday = Easter(year);
145148
return new Holiday(holiday, "Easter", "Domingo de Páscoa");
@@ -241,7 +244,6 @@ private Holiday AzoresDayHoliday(DateTime easter)
241244
/// <summary>
242245
/// Corpus Christi - Date varies(celebrated on the Thursday after Trinity Sunday, honoring the Eucharist) - Corpo de Deus
243246
/// </summary>
244-
/// <param name="easter">The year.</param>
245247
/// <returns></returns>
246248
public static DateTime CorpusChristi(int year)
247249
{
@@ -359,7 +361,7 @@ private static Holiday AssumptionHoliday(int year)
359361
/// </summary>
360362
/// <param name="year">The year.</param>
361363
/// <returns></returns>
362-
public static DateTime RepublicDay(int year)
364+
public static DateTime RepublicDay(int year)
363365
{
364366
return new DateTime(year, 10, 5);
365367
}
@@ -398,7 +400,7 @@ private static Holiday AllSaintsHoliday(int year)
398400
/// </summary>
399401
/// <param name="year">The year.</param>
400402
/// <returns></returns>
401-
public static DateTime IndependenceRestorationDay(int year)
403+
public static DateTime IndependenceRestorationDay(int year)
402404
{
403405
return new DateTime(year, 12, 1);
404406
}
@@ -418,7 +420,7 @@ private static Holiday IndependenceRestorationDayHoliday(int year)
418420
/// </summary>
419421
/// <param name="year">The year.</param>
420422
/// <returns></returns>
421-
public static DateTime ImmaculateConception(int year)
423+
public static DateTime ImmaculateConception(int year)
422424
{
423425
return new DateTime(year, 12, 8);
424426
}
@@ -581,7 +583,7 @@ public override bool IsPublicHoliday(DateTime dt)
581583
/// </summary>
582584
/// <param name="year">The given year</param>
583585
/// <returns></returns>
584-
public IList<Holiday> PublicHolidaysComplete(int year)
586+
public override IList<Holiday> PublicHolidaysInformation(int year)
585587
{
586588
// avoids having to recalculate it each time for different public holidays :
587589
var easterHoliday = EasterHoliday(year);

src/PublicHoliday/SwitzerlandPublicHoliday.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public static DateTime NewYear(int year)
220220
return new DateTime(year, 1, 1);
221221
}
222222

223-
private Holiday NewYearHoliday(int year)
223+
private static Holiday NewYearHoliday(int year)
224224
{
225225
DateTime holiday = NewYear(year);
226226
return new Holiday(holiday, "New Year", "Neujahrstag");
@@ -826,7 +826,7 @@ public static DateTime NationalDay(int year)
826826
return new DateTime(year, 8, 1);
827827
}
828828

829-
private Holiday NationalDayHoliday(int year)
829+
private static Holiday NationalDayHoliday(int year)
830830
{
831831
DateTime holiday = NationalDay(year);
832832
return new Holiday(holiday, "National Day", "Bundesfeier");
@@ -1065,7 +1065,7 @@ public static DateTime Christmas(int year)
10651065
return new DateTime(year, 12, 25);
10661066
}
10671067

1068-
private Holiday ChristmasHoliday(int year)
1068+
private static Holiday ChristmasHoliday(int year)
10691069
{
10701070
DateTime holiday = Christmas(year);
10711071
return new Holiday(holiday, "Christmas Day", "Weihnachten");
@@ -1236,10 +1236,10 @@ public override bool IsPublicHoliday(DateTime dt)
12361236
/// </summary>
12371237
/// <param name="year">The given year</param>
12381238
/// <returns></returns>
1239-
public IList<Holiday> PublicHolidaysComplete(int year)
1239+
public override IList<Holiday> PublicHolidaysInformation(int year)
12401240
{
12411241
// avoids having to recalculate it each time for different public holidays :
1242-
DateTime easter = HolidayCalculator.GetEaster(year);
1242+
var easter = HolidayCalculator.GetEaster(year);
12431243

12441244
var bHols = new List<Holiday>
12451245
{

0 commit comments

Comments
 (0)