Use enums for weekdays and months

Replace strings for weekday and month names with enums

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>

Author: lauft

ChangeLog

@@ -1,3 +1,4 @@
+- #147 Use enums for month and weekday names
 - #146 Use single available language of country as default language
 
 2026.1.1

docs/how-tos/define-holidays.md

@@ -36,21 +36,22 @@ The Holidata library provides a set of _date functions_ to handle the different
 The `date` function can be used for holidays taking place on a fixed date (_n-th day of a month_), e.g.:
 
 ```python
-date(month=1, day=1)    # January 1st
-date(month=12, day=25)  # December 25th
+date(Month.JANUARY, 1)    # January 1st
+date(Month.DECEMBER, 25)  # December 25th
 ```
 
 ### Weekday Occurrences
 
 For holidays which take place on a certain weekday of a month, there are the functions `first`, `second`, `third`, `fourth`, and `last` to handle those cases, e.g.:
+
 ```python
 # n-th occurrence of a weekday in a month
-first("monday").of("may")
-second("tuesday").of("june")
-third("wednesday").of("july")
-fourth("thursday").of("august")
+first(Weekday.MONDAY).of(Month.MAY)
+second(Weekday.TUESDAY).of(Month.JUNE)
+third(Weekday.WEDNESDAY).of(Month.JULY)
+fourth(Weekday.THURSDAY).of(Month.AUGUST)
 
-last("friday").of("september")
+last(Weekday.FRIDAY).of(Month.SEPTEMBER)
 ```
 
 ### Easter-Based Dates
@@ -82,14 +83,14 @@ day(2).before(<date_function>)  # 2 days before
 day(1).after(<date_function>)   # 1 day after 
 
 # Weekday before/after a date
-first("monday").before(<date_function>)
-second("tuesday").after(<date_function>)
+first(Weekday.MONDAY).before(<date_function>)
+second(Weekday.TUESDAY).after(<date_function>)
 ```
 
 Those calls can be nested. An example for this would be the German holiday _Buß- und Bettag_ which takes place on the 11th day before the first Advent Sunday, which is the fourth sunday before Christmas:
 
 ```python
-day(11).before(fourth("sunday").before(date(month=12, day=25)))
+day(11).before(fourth(Weekday.SUNDAY).before(date(Month.DECEMBER, 25)))
 ```
 
 ### Custom Date Functions

src/holidata/holiday.py

@@ -26,7 +26,7 @@ def as_dict(self) -> dict:
             "date": self.date.strftime("%Y-%m-%d"),
             "description": self.description,
             "type": self.flags,
-            "notes": self.notes
+            "notes": self.notes,
         }
 
 

src/holidata/holidays/AT/__init__.py

@@ -1,7 +1,7 @@
 from dateutil.easter import EASTER_WESTERN
 
 from holidata.holiday import Country
-from holidata.utils import day, date
+from holidata.utils import day, date, Month
 
 __all__ = [
     "AT",
@@ -18,93 +18,93 @@ def __init__(self):
 
         self.define_holiday() \
             .with_name("Neujahr") \
-            .on(date(month=1, day=1)) \
+            .on(date(Month.JANUARY, 1)) \
             .with_flags("NF")
 
         self.define_holiday() \
             .with_name("Heilige drei Könige") \
-            .on(date(month=1, day=6)) \
+            .on(date(Month.JANUARY, 6)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Josef") \
             .in_regions(["2", "6", "7", "8"]) \
-            .on(date(month=3, day=19)) \
+            .on(date(Month.MARCH, 19)) \
             .with_flags("RF")
 
         self.define_holiday() \
             .with_name("Staatsfeiertag") \
-            .on(date(month=5, day=1)) \
+            .on(date(Month.MAY, 1)) \
             .with_flags("NF")
 
         self.define_holiday() \
             .with_name("Florian") \
             .in_regions(["4"]) \
-            .on(date(month=5, day=4)) \
+            .on(date(Month.MAY, 4)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("Mariä Himmelfahrt") \
-            .on(date(month=8, day=15)) \
+            .on(date(Month.AUGUST, 15)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Rupert") \
             .in_regions(["5"]) \
-            .on(date(month=9, day=24)) \
+            .on(date(Month.SEPTEMBER, 24)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("Tag der Volksabstimmung") \
             .in_regions(["2"]) \
-            .on(date(month=10, day=10)) \
+            .on(date(Month.OCTOBER, 10)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("Nationalfeiertag") \
-            .on(date(month=10, day=26)) \
+            .on(date(Month.OCTOBER, 26)) \
             .with_flags("NF")
 
         self.define_holiday() \
             .with_name("Allerheiligen") \
-            .on(date(month=11, day=1)) \
+            .on(date(Month.NOVEMBER, 1)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Martin") \
             .in_regions(["1"]) \
-            .on(date(month=11, day=11)) \
+            .on(date(Month.NOVEMBER, 11)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("Leopold") \
             .in_regions(["9", "3"]) \
-            .on(date(month=11, day=15)) \
+            .on(date(Month.NOVEMBER, 15)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("Mariä Empfängnis") \
-            .on(date(month=12, day=8)) \
+            .on(date(Month.DECEMBER, 8)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Heiliger Abend") \
-            .on(date(month=12, day=24)) \
+            .on(date(Month.DECEMBER, 24)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Christtag") \
-            .on(date(month=12, day=25)) \
+            .on(date(Month.DECEMBER, 25)) \
             .with_flags("NRF")
 
         self.define_holiday() \
             .with_name("Stefanitag") \
-            .on(date(month=12, day=26)) \
+            .on(date(Month.DECEMBER, 26)) \
             .with_flags("NF")
 
         self.define_holiday() \
             .with_name("Silvester") \
-            .on(date(month=12, day=31)) \
+            .on(date(Month.DECEMBER, 31)) \
             .with_flags("NF")
 
         self.define_holiday() \

src/holidata/holidays/AU/ACT.py

@@ -1,5 +1,5 @@
 from holidata.holiday import Region
-from holidata.utils import first, second, day, date
+from holidata.utils import first, second, day, date, Weekday, Month
 
 
 class ACT(Region):
@@ -13,14 +13,14 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("New Year's Day") \
-            .on(date(month=1, day=1)) \
+            .on(date(Month.JANUARY, 1)) \
             .with_flags("F")
 
         self.define_holiday() \
             .with_name("New Year's Day (observed)") \
-            .on(first("monday").after(date(month=1, day=1))) \
+            .on(first(Weekday.MONDAY).after(date(Month.JANUARY, 1))) \
             .with_flags("V") \
-            .on_condition(date(month=1, day=1).is_one_of(["saturday", "sunday"]))
+            .on_condition(date(Month.JANUARY, 1).is_one_of([Weekday.SATURDAY, Weekday.SUNDAY]))
 
         """
         Australia Day
@@ -29,14 +29,14 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Australia Day") \
-            .on(date(month=1, day=26)) \
-            .on_condition(date(month=1, day=26).is_none_of(["saturday", "sunday"])) \
+            .on(date(Month.JANUARY, 26)) \
+            .on_condition(date(Month.JANUARY, 26).is_none_of([Weekday.SATURDAY, Weekday.SUNDAY])) \
             .with_flags("V")
 
         self.define_holiday() \
             .with_name("Australia Day") \
-            .on(first("monday").after(date(month=1, day=26))) \
-            .on_condition(date(month=1, day=26).is_one_of(["saturday", "sunday"])) \
+            .on(first(Weekday.MONDAY).after(date(Month.JANUARY, 26))) \
+            .on_condition(date(Month.JANUARY, 26).is_one_of([Weekday.SATURDAY, Weekday.SUNDAY])) \
             .with_flags("V")
 
         """
@@ -46,7 +46,7 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Canberra Day") \
-            .on(second("monday").of("march")) \
+            .on(second(Weekday.MONDAY).of(Month.MARCH)) \
             .with_flags("V")
 
         """
@@ -92,14 +92,14 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Anzac Day") \
-            .on(date(month=4, day=25)) \
-            .on_condition(date(month=4, day=25).is_not_a("sunday")) \
+            .on(date(Month.APRIL, 25)) \
+            .on_condition(date(Month.APRIL, 25).is_not_a(Weekday.SUNDAY)) \
             .with_flags("V")
 
         self.define_holiday() \
             .with_name("Anzac Day") \
-            .on(first("monday").after(date(month=4, day=25))) \
-            .on_condition(date(month=4, day=25).is_a("sunday")) \
+            .on(first(Weekday.MONDAY).after(date(Month.APRIL, 25))) \
+            .on_condition(date(Month.APRIL, 25).is_a(Weekday.SUNDAY)) \
             .with_flags("V")
 
         """
@@ -109,7 +109,7 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Reconciliation Day") \
-            .on(first("monday").after(date(month=5, day=26), including=True)) \
+            .on(first(Weekday.MONDAY).after(date(Month.MAY, 26), including=True)) \
             .with_flags("V")
 
         """
@@ -120,13 +120,13 @@ def __init__(self, country):
         self.define_holiday() \
             .with_name("Queen's Birthday") \
             .until(2022) \
-            .on(second("monday").of("june")) \
+            .on(second(Weekday.MONDAY).of(Month.JUNE)) \
             .with_flags("V")
 
         self.define_holiday() \
             .with_name("King's Birthday") \
             .since(2023) \
-            .on(second("monday").of("june")) \
+            .on(second(Weekday.MONDAY).of(Month.JUNE)) \
             .with_flags("V")
 
         """
@@ -136,7 +136,7 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Bank Holiday") \
-            .on(first("monday").of("august")) \
+            .on(first(Weekday.MONDAY).of(Month.AUGUST)) \
             .with_flags("V")
 
         """
@@ -146,7 +146,7 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Labour Day") \
-            .on(first("monday").of("october")) \
+            .on(first(Weekday.MONDAY).of(Month.OCTOBER)) \
             .with_flags("V")
 
         """
@@ -156,20 +156,20 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Christmas Day") \
-            .on(date(month=12, day=25)) \
+            .on(date(Month.DECEMBER, 25)) \
             .with_flags("RF")
 
         self.define_holiday() \
             .with_name("Christmas Day (observed)") \
-            .on(first("monday").after(date(month=12, day=25))) \
+            .on(first(Weekday.MONDAY).after(date(Month.DECEMBER, 25))) \
             .with_flags("RV") \
-            .on_condition(date(month=12, day=25).is_a("saturday"))
+            .on_condition(date(Month.DECEMBER, 25).is_a(Weekday.SATURDAY))
 
         self.define_holiday() \
             .with_name("Christmas Day (observed)") \
-            .on(first("tuesday").after(date(month=12, day=25))) \
+            .on(first(Weekday.TUESDAY).after(date(Month.DECEMBER, 25))) \
             .with_flags("RV") \
-            .on_condition(date(month=12, day=25).is_a("sunday"))
+            .on_condition(date(Month.DECEMBER, 25).is_a(Weekday.SUNDAY))
 
         """
         Boxing Day
@@ -178,17 +178,17 @@ def __init__(self, country):
         """
         self.define_holiday() \
             .with_name("Boxing Day") \
-            .on(date(month=12, day=26)) \
+            .on(date(Month.DECEMBER, 26)) \
             .with_flags("RF")
 
         self.define_holiday() \
             .with_name("Boxing Day (observed)") \
-            .on(first("monday").after(date(month=12, day=26))) \
+            .on(first(Weekday.MONDAY).after(date(Month.DECEMBER, 26))) \
             .with_flags("RV") \
-            .on_condition(date(month=12, day=26).is_a("saturday"))
+            .on_condition(date(Month.DECEMBER, 26).is_a(Weekday.SATURDAY))
 
         self.define_holiday() \
             .with_name("Boxing Day (observed)") \
-            .on(first("tuesday").after(date(month=12, day=26))) \
+            .on(first(Weekday.TUESDAY).after(date(Month.DECEMBER, 26))) \
             .with_flags("RV") \
-            .on_condition(date(month=12, day=26).is_a("sunday"))
+            .on_condition(date(Month.DECEMBER, 26).is_a(Weekday.SUNDAY))