Merge pull request #137 from focus-shift/135-queens-funeral

GB: Add queens state funeral
focus-shift · Sep 12, 2022 · eb88454 · eb88454
2 parents 97b4e1b + c31df34
commit eb88454
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proclamation Day
 holiday.description.PULASKI                        = Casimir Pulaski Day
 holiday.description.QUEENS_BIRTHDAY                = Queen's birthday
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Day of the Race
 holiday.description.RECONCILIATION                 = Day of Reconciliation
 holiday.description.RECREATION                     = Recreation Day

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proklamationstag
 holiday.description.PULASKI                        = Casimir Pulaski Tag
 holiday.description.QUEENS_BIRTHDAY                = Geburtstag der Königin
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Kolumbus-Tag
 holiday.description.RECONCILIATION                 = Tag der Versöhnung
 holiday.description.RECREATION                     = Erholungstag

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proclamation Day
 holiday.description.PULASKI                        = Casimir Pulaski Day
 holiday.description.QUEENS_BIRTHDAY                = Queen's birthday
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Day of the Race
 holiday.description.RECONCILIATION                 = Day of Reconciliation
 holiday.description.RECREATION                     = Recreation Day

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proclamation Day
 holiday.description.PULASKI                        = Casimir Pulaski Day
 holiday.description.QUEENS_BIRTHDAY                = Queen's birthday
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Day of the Race
 holiday.description.RECONCILIATION                 = Day of Reconciliation
 holiday.description.RECREATION                     = Recreation Day

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proclamatiedag
 holiday.description.PULASKI                        = Casimir Pulaski Dag
 holiday.description.QUEENS_BIRTHDAY                = Koninginnedag
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Dag van de race
 holiday.description.RECONCILIATION                 = Dag van de verzoening
 holiday.description.RECREATION                     = Recreation dag

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Dia da Proclamação
 holiday.description.PULASKI                        = Casimir Pulaski Day
 holiday.description.QUEENS_BIRTHDAY                = Aniversário da Rainha
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Dia da Corrida
 holiday.description.RECONCILIATION                 = Dia da Reconciliação
 holiday.description.RECREATION                     = Dia da Recriação

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
@@ -185,6 +185,7 @@ holiday.description.PROCLAMATION                   = Proclamation Day
 holiday.description.PULASKI                        = Casimir Pulaski Day
 holiday.description.QUEENS_BIRTHDAY                = Queen's birthday
 holiday.description.QUEENS_PLATINUM_JUBILEE        = Queen's Platinum Jubilee
+holiday.description.QUEENS_STATE_FUNERAL           = Queen's State Funeral
 holiday.description.RACE                           = Day of the Race
 holiday.description.RECONCILIATION                 = Day of Reconciliation
 holiday.description.RECREATION                     = Recreation Day

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_gb.xml b/jollyday-core/src/main/resources/holidays/Holidays_gb.xml
@@ -17,6 +17,7 @@
     <!-- The 2022 spring bank holiday was moved from the 4th of May to the second of June -->
     <tns:Fixed month="JUNE" day="2" validFrom="2022" validTo="2022" descriptionPropertiesKey="SPRING_BANK_HOLIDAY"/>
     <tns:Fixed month="JUNE" day="3" validFrom="2022" validTo="2022" descriptionPropertiesKey="QUEENS_PLATINUM_JUBILEE"/>
+    <tns:Fixed month="SEPTEMBER" day="19" validFrom="2022" validTo="2022" descriptionPropertiesKey="QUEENS_STATE_FUNERAL"/>
 
     <tns:FixedWeekday which="FIRST" weekday="MONDAY" month="MAY" validFrom="1900" validTo="2019" descriptionPropertiesKey="EARLY_MAY_BANK_HOLIDAY"/>
     <tns:FixedWeekday which="SECOND" weekday="FRIDAY" month="MAY" validFrom="2020" validTo="2020" descriptionPropertiesKey="EARLY_MAY_BANK_HOLIDAY"/>

diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_gb_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_gb_2022.xml
@@ -7,6 +7,7 @@
     <tns:Fixed month="MAY" day="2" descriptionPropertiesKey="EARLY_MAY_BANK_HOLIDAY"/>
     <tns:Fixed month="JUNE" day="2" descriptionPropertiesKey="SPRING_BANK_HOLIDAY"/>
     <tns:Fixed month="JUNE" day="3" descriptionPropertiesKey="QUEENS_PLATINUM_JUBILEE"/>
+    <tns:Fixed month="SEPTEMBER" day="19" descriptionPropertiesKey="QUEENS_STATE_FUNERAL"/>
     <tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY"/>
     <tns:Fixed month="DECEMBER" day="27" descriptionPropertiesKey="CHRISTMAS"/>
   </tns:Holidays>