Switzerland - Fix Labour Day (#692)

nager · Sep 30, 2024 · 55ed02b · 55ed02b
1 parent e2133ca
commit 55ed02b
Showing 1 changed file with 27 additions and 8 deletions.
diff --git a/src/Nager.Date/HolidayProviders/SwitzerlandHolidayProvider.cs b/src/Nager.Date/HolidayProviders/SwitzerlandHolidayProvider.cs
@@ -90,14 +90,6 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
                     SubdivisionCodes = ["CH-NE"]
                 },
                 new HolidaySpecification
-                {
-                    Date = new DateTime(year, 5, 1),
-                    EnglishName = "Labour Day",
-                    LocalName = "Tag der Arbeit",
-                    HolidayTypes = HolidayTypes.Public,
-                    SubdivisionCodes = ["CH-ZH", "CH-FR", "CH-SO", "CH-BS", "CH-BL", "CH-SH", "CH-AG", "CH-TG", "CH-TI", "CH-NE", "CH-JU"]
-                },
-                new HolidaySpecification
                 {
                     Date = new DateTime(year, 6, 29),
                     EnglishName = "Saints Peter and Paul",
@@ -171,6 +163,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
                 this._catholicProvider.AscensionDay("Auffahrt", year),
             };
 
+            holidaySpecifications.AddRangeIfNotNull(this.LabourDay(year));
             holidaySpecifications.AddRangeIfNotNull(this.ImmaculateConception(year));
             holidaySpecifications.AddRangeIfNotNull(this.WhitMonday(year));
             holidaySpecifications.AddRangeIfNotNull(this.EasterMonday(year));
@@ -322,6 +315,32 @@ private HolidaySpecification[] ImmaculateConception(int year)
             ];
         }
 
+        private HolidaySpecification[] LabourDay(int year)
+        {
+            var englishName = "Labour Day";
+            var localName = "Tag der Arbeit";
+
+            return
+            [
+                new HolidaySpecification
+                {
+                    Date = new DateTime(year, 5, 1),
+                    EnglishName = englishName,
+                    LocalName = localName,
+                    HolidayTypes = HolidayTypes.Public,
+                    SubdivisionCodes = ["CH-ZH", "CH-SO", "CH-BS", "CH-BL", "CH-SH", "CH-AG", "CH-NE", "CH-JU"]
+                },
+                new HolidaySpecification
+                {
+                    Date = new DateTime(year, 5, 1),
+                    EnglishName = englishName,
+                    LocalName = localName,
+                    HolidayTypes = HolidayTypes.Observance,
+                    SubdivisionCodes = ["CH-TG", "CH-TI"]
+                }
+            ];
+        }
+
         /// <inheritdoc/>
         public override IEnumerable<string> GetSources()
         {