Merge pull request #60 from tenjaa/master

Add holidays for New Zealand
svendiedrichsen · Dec 13, 2017 · bb09de4 · bb09de4
2 parents 3ee3df6 + a51b853
commit bb09de4
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 0 deletions.
diff --git a/src/main/resources/descriptions/holiday_descriptions.properties b/src/main/resources/descriptions/holiday_descriptions.properties
@@ -49,6 +49,7 @@ holiday.description.CONST_REVOLUTION               = Constitutionalist Revolutio
 holiday.description.CULTURE_DAY                    = Culture Day
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Saints Cyril and Methodius Day
+holiday.description.DAY_AFTER_NEW_YEAR             = Day after New Year
 holiday.description.DAYTON                         = Dayton Agreement
 holiday.description.DEFENDER_FATHERLAND            = Defender of the Fatherland
 holiday.description.EDU_CULTURE                    = Education, Culture and Literature Day
@@ -215,6 +216,7 @@ holiday.description.VICTORY_ADWA                   = Victory at Adwa Day
 holiday.description.VICTORY_DAY                    = Wars end in Europe
 holiday.description.VIRGIN_CARMEN                  = Virgin Carmen day
 holiday.description.VIRGIN_MARY                    = Virgin Mary Day
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Washington's Birthday
 holiday.description.WENCELAS                       = St. Wenceslas Day
 holiday.description.WEST_VIRGINIA                  = West Virginia Day

diff --git a/src/main/resources/descriptions/holiday_descriptions_de.properties b/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -49,6 +49,7 @@ holiday.description.CONST_REVOLUTION               = Konstitutionalisten Revolut
 holiday.description.CULTURE_DAY                    = Kulturtag
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Heiligen Cyril und Methodius Tag
+holiday.description.DAY_AFTER_NEW_YEAR             = Tag nach Neujahr
 holiday.description.DAYTON                         = Dayton Abkommen
 holiday.description.DEFENDER_FATHERLAND            = Verteidiger des Vaterlandes
 holiday.description.EDU_CULTURE                    = Bildungs-, Kultur- und Literatur-Tag
@@ -215,6 +216,7 @@ holiday.description.VICTORY_ADWA                   = Sieg bei Adwa Tag
 holiday.description.VICTORY_DAY                    = Kriegsende in Europa
 holiday.description.VIRGIN_CARMEN                  = Jungfrau Carmen
 holiday.description.VIRGIN_MARY                    = Jungfrau Maria Tag
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Washington's Geburtstag
 holiday.description.WENCELAS                       = St. Wenceslas Tag
 holiday.description.WEST_VIRGINIA                  = West Virginia Tag

diff --git a/src/main/resources/descriptions/holiday_descriptions_en.properties b/src/main/resources/descriptions/holiday_descriptions_en.properties
@@ -49,6 +49,7 @@ holiday.description.CONST_REVOLUTION               = Constitutionalist Revolutio
 holiday.description.CULTURE_DAY                    = Culture Day
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Saints Cyril and Methodius Day
+holiday.description.DAY_AFTER_NEW_YEAR             = Day after New Year
 holiday.description.DAYTON                         = Dayton Agreement
 holiday.description.DEFENDER_FATHERLAND            = Defender of the Fatherland
 holiday.description.EDU_CULTURE                    = Education, Culture and Literature Day
@@ -215,6 +216,7 @@ holiday.description.VICTORY_ADWA                   = Victory at Adwa Day
 holiday.description.VICTORY_DAY                    = Wars end in Europe
 holiday.description.VIRGIN_CARMEN                  = Virgin Carmen day
 holiday.description.VIRGIN_MARY                    = Virgin Mary Day
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Washington's Birthday
 holiday.description.WENCELAS                       = St. Wenceslas Day
 holiday.description.WEST_VIRGINIA                  = West Virginia Day

diff --git a/src/main/resources/descriptions/holiday_descriptions_fr.properties b/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -50,6 +50,7 @@ holiday.description.CONST_REVOLUTION               = R\u00E9volution de Constitu
 holiday.description.CULTURE_DAY                    = Journ\u00E9e de la Culture
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Jour de Saint Cyril et Methodius
+holiday.description.DAY_AFTER_NEW_YEAR             = Jour après le Nouvel An
 holiday.description.DAYTON                         = Accord de Dayton
 holiday.description.DEFENDER_FATHERLAND            = D\u00E9tenteur de la Patrie
 holiday.description.EDU_CULTURE                    = Journ\u00E9e de l'Education, de la Culture et de la Lit\u00E9rature
@@ -216,6 +217,7 @@ holiday.description.VICTORY_ADWA                   = Victory at Adwa Day
 holiday.description.VICTORY_DAY                    = F\u00EAte de la fin de la guerre en Europe
 holiday.description.VIRGIN_CARMEN                  = Virgin Carmen day
 holiday.description.VIRGIN_MARY                    = Virgin Mary Day
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Anniversaire de Washington
 holiday.description.WENCELAS                       = Journ\u00E9e de St. Wenceslas
 holiday.description.WEST_VIRGINIA                  = Journ\u00E9e de la Virginie de l'ouest

diff --git a/src/main/resources/descriptions/holiday_descriptions_nl.properties b/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -49,6 +49,7 @@ holiday.description.CONST_REVOLUTION               = Constitutionalistische revo
 holiday.description.CULTURE_DAY                    = Dag van de cultuur
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Cyrillus en Methodius dag
+holiday.description.DAY_AFTER_NEW_YEAR             = Dag na Nieuwjaar
 holiday.description.DAYTON                         = Dayton-akkoord
 holiday.description.DEFENDER_FATHERLAND            = De verdediger van het vaderland
 holiday.description.EDU_CULTURE                    = Onderwijs, cultuur en literatuurdag
@@ -215,6 +216,7 @@ holiday.description.VICTORY_ADWA                   = Victory op Adwa dag
 holiday.description.VICTORY_DAY                    = Wars end in Europe
 holiday.description.VIRGIN_CARMEN                  = Virgin Carmen dag
 holiday.description.VIRGIN_MARY                    = Virgin Mary Dag
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Washington's verjaardag
 holiday.description.WENCELAS                       = St. Wenceslas dag
 holiday.description.WEST_VIRGINIA                  = West Virginia Dag

diff --git a/src/main/resources/descriptions/holiday_descriptions_pt.properties b/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -50,6 +50,7 @@ holiday.description.CONST_REVOLUTION               = Revolu\u00E7\u00E3o Constit
 holiday.description.CULTURE_DAY                    = Dia da Cultura
 holiday.description.CYBER_MONDAY                   = Cyber Monday
 holiday.description.CYRUS_METHODIUS                = Dia dos Santos Cyril e Methodius
+holiday.description.DAY_AFTER_NEW_YEAR             = Dia após o Ano Novo
 holiday.description.DAYTON                         = Acordo de Dayton
 holiday.description.DEFENDER_FATHERLAND            = Defender of the Fatherland
 holiday.description.EDU_CULTURE                    = Dia da Educa\u00E7\u00E3o, da Cultura e da Literatura
@@ -216,6 +217,7 @@ holiday.description.VICTORY_ADWA                   = Vit\u00F3ria de Adwa Day
 holiday.description.VICTORY_DAY                    = Wars end in Europe
 holiday.description.VIRGIN_CARMEN                  = Dia da Virgem Carmen
 holiday.description.VIRGIN_MARY                    = Dia da Virgem Maria
+holiday.description.WAITANGI_DAY                   = Waitangi Day
 holiday.description.WASHINGTONS_BIRTHDAY           = Anivers\u00E1rio de Washington
 holiday.description.WENCELAS                       = Dia de St. Wenceslas
 holiday.description.WEST_VIRGINIA                  = Dia de West Virginia

diff --git a/src/main/resources/holidays/Holidays_nz.xml b/src/main/resources/holidays/Holidays_nz.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="nz" description="New Zealand"
+	xmlns:tns="http://www.example.org/Holiday" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+	<tns:Holidays>
+		<tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY" />
+            <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY" />
+		</tns:Fixed>
+		<tns:Fixed month="JANUARY" day="2" descriptionPropertiesKey="DAY_AFTER_NEW_YEAR">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+			<tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="TUESDAY" />
+		</tns:Fixed>
+		<tns:Fixed month="FEBRUARY" day="6" validTo="2015" descriptionPropertiesKey="WAITANGI_DAY"/>
+		<tns:Fixed month="FEBRUARY" day="6" validFrom="2016" descriptionPropertiesKey="WAITANGI_DAY">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+			<tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+		</tns:Fixed>
+		<tns:Fixed month="APRIL" day="25" validTo="2014" descriptionPropertiesKey="ANZAC"/>
+		<tns:Fixed month="APRIL" day="25" validFrom="2015" descriptionPropertiesKey="ANZAC">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+			<tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+		</tns:Fixed>
+		<tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY" />
+			<tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY" />
+		</tns:Fixed>
+		<tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY">
+			<tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY" />
+			<tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="TUESDAY" />
+		</tns:Fixed>
+
+		<tns:FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+		<tns:FixedWeekday which="FOURTH" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
+
+		<tns:ChristianHoliday type="GOOD_FRIDAY" />
+		<tns:ChristianHoliday type="EASTER_MONDAY" />
+	</tns:Holidays>
+</tns:Configuration>