Repository: focus-shift/jollyday (java)

Issue:
Cabrini Day missing in the USA in colorado
### Affected country

USA

### Affected public holiday

Cabrini Day

### Source of the information

https://www.cpr.org/2020/10/03/monday-is-colorados-1st-mother-cabrini-day-heres-why-the-state-chose-her-to-replace-columbus-day/

### More information

Also Columbus day will be replaces by this day in Colorado starting with 2020

https://leg.colorado.gov/bills/hb19-1185

Pull request:
usa: add cabrini day in colorado startin with 2020 and end columbus d…
…ay in 2020

closes #644

<!--

Thanks for contributing.
Please review the following notes before submitting you pull request.

Please look for other issues or pull requests which already work on this topic. Is somebody already on it? Do you need to synchronize?

# Security Vulnerabilities

🛑 STOP! 🛑 If your contribution fixes a security vulnerability, please do not submit it.
Instead, please write an E-Mail to to one of the maintainer with all the information
to recreate the security vulnerability.

# Describing Your Changes

If, having reviewed the notes above, you're ready to submit your pull request, please
provide a brief description of the proposed changes.

If they:
 🐞 fix a bug, please describe the broken behaviour and how the changes fix it.
    Please label with 'type: bug' and 'status: new'
    
 🎁 make an enhancement, please describe the new functionality and why you believe it's useful.
    Please label with 'type: enhancement' and 'status: new'
 
If your pull request relates to any existing issues,
please reference them by using the issue number prefixed with #.

-->


Patch:
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
index 2248598b..b0f13833 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Bridging Holiday
 holiday.description.BROOKLY_QUEENS                                                      = Brooklyn-Queens Day
 holiday.description.BUNKER_HILL                                                         = Bunker Hill Day
+holiday.description.CABRINI_DAY                                                         = Cabrini Day
 holiday.description.CANADA_DAY                                                          = Canada Day
 holiday.description.CANBERRA_DAY                                                        = Canberra Day
 holiday.description.CANDELARIA                                                          = Fiesta de la Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
index d7b54d6e..d4d11ea2 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Brückentag
 holiday.description.BROOKLY_QUEENS                                                      = Brooklyn-Queens Tag
 holiday.description.BUNKER_HILL                                                         = Bunker Hill Tag
+holiday.description.CABRINI_DAY                                                         = Cabrini-Tag
 holiday.description.CANADA_DAY                                                          = Kanadatag
 holiday.description.CANBERRA_DAY                                                        = Canberra Tag
 holiday.description.CANDELARIA                                                          = Fest der Jungfrau von Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
index 66a4564c..26934140 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Γιορτή γεφύρωσης
 holiday.description.BROOKLY_QUEENS                                                      = Ημέρα Brooklyn-Queens
 holiday.description.BUNKER_HILL                                                         = Ημέρα του Bunker Hill
+holiday.description.CABRINI_DAY                                                         = Ημέρα της Καμπρίνι
 holiday.description.CANADA_DAY                                                          = Ημέρα του Καναδά
 holiday.description.CANBERRA_DAY                                                        = Ημέρα της Καμπέρα
 holiday.description.CANDELARIA                                                          = Fiesta de la Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
index cda0a9c3..11616ab9 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Pont de Jour férier
 holiday.description.BROOKLY_QUEENS                                                      = Journée des reines de Brooklyn
 holiday.description.BUNKER_HILL                                                         = jour du Bunker dde la Colinne
+holiday.description.CABRINI_DAY                                                         = Journée de Cabrini
 holiday.description.CANADA_DAY                                                          = Fête du Canada
 holiday.description.CANBERRA_DAY                                                        = Journée de Camberra
 holiday.description.CANDELARIA                                                          = Fête de la Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
index b84935d1..637d5d0e 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = brugdag
 holiday.description.BROOKLY_QUEENS                                                      = Brooklyn-Queens Dag
 holiday.description.BUNKER_HILL                                                         = Bunker Hill Dag
+holiday.description.CABRINI_DAY                                                         = Cabrini-dag
 holiday.description.CANADA_DAY                                                          = Canadese dag
 holiday.description.CANBERRA_DAY                                                        = Canberra dag
 holiday.description.CANDELARIA                                                          = Fiesta de la Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
index 45892ebb..30a01473 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Ponte
 holiday.description.BROOKLY_QUEENS                                                      = Dia de Brooklyn-Queens
 holiday.description.BUNKER_HILL                                                         = Bunker Hill Day
+holiday.description.CABRINI_DAY                                                         = Dia de Cabrini
 holiday.description.CANADA_DAY                                                          = Dia do Canadá
 holiday.description.CANBERRA_DAY                                                        = Dia Canberra
 holiday.description.CANDELARIA                                                          = Fiesta de la Candelaria
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
index 428da045..af71cff4 100644
--- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
+++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
@@ -42,6 +42,7 @@ holiday.description.BOYACA
 holiday.description.BRIDGING_HOLIDAY                                                    = Bridging Holiday
 holiday.description.BROOKLY_QUEENS                                                      = Brooklyn-Queens Day
 holiday.description.BUNKER_HILL                                                         = Bunker Hill Day
+holiday.description.CABRINI_DAY                                                         = Cabrini-dagen
 holiday.description.CANADA_DAY                                                          = Kanadas dag
 holiday.description.CANBERRA_DAY                                                        = Canberra Day
 holiday.description.CANDELARIA                                                          = Fiesta de la Candelaria
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_us.xml b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
index 0eb95e18..2cb249a0 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_us.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
@@ -94,9 +94,14 @@
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1906" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <!-- Cabrini Day is missing on first monday in october -->
+      <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" validFrom="2020" descriptionPropertiesKey="CABRINI_DAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1906" validTo="2019" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
+
+    <Sources>
+      <Source>https://leg.colorado.gov/bills/hb19-1185</Source>
+      <Source>https://www.cpr.org/2020/10/03/monday-is-colorados-1st-mother-cabrini-day-heres-why-the-state-chose-her-to-replace-columbus-day/</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ct" description="Connecticut">


Test patch:
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
index e16860f5..d9c832ea 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
@@ -54,7 +54,7 @@
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
+      <Fixed month="OCTOBER" day="3" descriptionPropertiesKey="CABRINI_DAY"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="ct" description="Connecticut">