From c11eb38635ecafe7eab68b9fcd78682c9ca612f0 Mon Sep 17 00:00:00 2001 From: XSpielinbox <55600187+xspielinbox@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:18:38 +0200 Subject: [PATCH 1/5] Add Mauritius public holidays --- .../jollyday/core/HolidayCalendar.java | 2 +- .../holiday_descriptions.properties | 11 ++ .../main/resources/holidays/Holidays_mu.xml | 131 ++++++++++++++++++ .../jollyday/tests/country/HolidayMUTest.java | 67 +++++++++ .../holidays/Holidays_test_mu_2013.xml | 23 +++ .../holidays/Holidays_test_mu_2014.xml | 23 +++ .../holidays/Holidays_test_mu_2015.xml | 23 +++ .../holidays/Holidays_test_mu_2016.xml | 23 +++ .../holidays/Holidays_test_mu_2017.xml | 23 +++ .../holidays/Holidays_test_mu_2018.xml | 23 +++ .../holidays/Holidays_test_mu_2019.xml | 23 +++ .../holidays/Holidays_test_mu_2020.xml | 23 +++ .../holidays/Holidays_test_mu_2021.xml | 23 +++ .../holidays/Holidays_test_mu_2022.xml | 23 +++ .../holidays/Holidays_test_mu_2023.xml | 24 ++++ .../holidays/Holidays_test_mu_2024.xml | 23 +++ 16 files changed, 487 insertions(+), 1 deletion(-) create mode 100644 jollyday-core/src/main/resources/holidays/Holidays_mu.xml create mode 100644 jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMUTest.java create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2013.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2014.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2015.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2016.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2017.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2018.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2019.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2020.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2021.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2022.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2023.xml create mode 100644 jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2024.xml diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java index ff31b7390..f5e2c3a44 100644 --- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java +++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java @@ -22,7 +22,7 @@ public enum HolidayCalendar { JAPAN("JP"), KAZAKHSTAN("KZ"), KOSOVO("XK"), LATVIA("LV"), LIECHTENSTEIN("LI"), LITHUANIA("LT"), LONDON_METAL_EXCHANGE("LME"), LUXEMBOURG("LU"), - MACEDONIA("MK"), MALTA("MT"), MEXICO("MX"), MOLDOVA("MD"), MONTENEGRO("ME"), + MACEDONIA("MK"), MALTA("MT"), MAURITIUS("MU"), MEXICO("MX"), MOLDOVA("MD"), MONTENEGRO("ME"), NETHERLANDS("NL"), NEW_ZEALAND("NZ"), NICARAGUA("NI"), NIGERIA("NG"), NORWAY("NO"), NYSE("NYSE"), PANAMA("PA"), PARAGUAY("PY"), PERU("PE"), POLAND("PL"), PORTUGAL("PT"), ROMANIA("RO"), RUSSIA("RU"), diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties index 7b7e709cc..451573e4b 100644 --- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties +++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties @@ -1,5 +1,6 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA = 170th Anniversary of the arrival of the first Portuguese immigrants in Bermuda holiday.description.1949_GREAT_MARCH_AND_RESTORATION = The Commemoration of the 1949 Great March and the Restoration of the Legislative Council +holiday.description.ABOLITION_OF_SLAVERY = Abolition of Slavery holiday.description.ADELAIDE_CUP = Adelaide Cup holiday.description.AE_COMMEMORATION_DAY = Commemoration Day holiday.description.AFL = AFL Grand Final Friday @@ -15,7 +16,9 @@ holiday.description.APARECIDA = Our Lady of Aparecida holiday.description.ARBOR = Arbor Day holiday.description.ARMISTICE = Armistice Day holiday.description.ARMY_DAY = Army Day +holiday.description.ARRIVAL_OF_INDENTURED_LABORERS = Arrival of Indentured Labourers holiday.description.ARTIGAS = Artigas' Birthday +holiday.description.ASSUMPTION_BLESSED_VIRGIN_MARY = Assumption of the Blessed Virgin Mary holiday.description.ASSUMPTION_DAY = Assumption day holiday.description.ASSUMPTION_MARY = Assumption of Mary holiday.description.AUCKLAND_ANNIVERSARY = Auckland Anniversary @@ -44,6 +47,7 @@ holiday.description.CESAR_CHAVEZ = César Chávez's Birthday holiday.description.CHACO_ARMISTICE = Chaco Armistice holiday.description.CHATHAM_ISLANDS_ANNIVERSARY = Chatham Islands Anniversary holiday.description.CHILDRENS_DAY = Children's Day +holiday.description.CHINESE_SPRING_FESTIVAL = Chinese Spring Festival holiday.description.CHRISTMAS = Christmas holiday.description.CHRISTMAS_EVE = Christmas Eve holiday.description.CITY_DAY = Capital day @@ -73,6 +77,7 @@ holiday.description.DECLARATION_OF_INDEPENDENCE_DAY = Declaration of Independen holiday.description.DEFENDER_FATHERLAND = Defender of the Fatherland holiday.description.DEFENDER_OF_UKRAINE = Defender of Ukraine Day holiday.description.DISCOVERY_DAY = Discovery Day +holiday.description.DIVALI = Divali holiday.description.EARLY_MAY_BANK_HOLIDAY = Early May Bank Holiday holiday.description.EDU_CULTURE = Education, Culture and Literature Day holiday.description.EGYPT_23_JULY_REVOLUTION = July 23rd Revolution Day @@ -111,6 +116,7 @@ holiday.description.FREEDOM = Freedom Day holiday.description.FREEDOM_DEMOCRACY = Freedom and Democracy Day holiday.description.FUNERAL_OF_PRESIDENT_REAGAN = Funeral of President Reagan holiday.description.GALICIAN_LITERATURE = Galician Literature Day +holiday.description.GANESH_CHATURTHI = Ganesh Chaturthi holiday.description.GENEVAN_FAST = Genevan Fast holiday.description.GHANDIS_BIRTHDAY = Ghandis birthday holiday.description.GOODWILL = Day of Goodwill @@ -130,6 +136,7 @@ holiday.description.HUS = Jan Hus Day holiday.description.HUSBANDS_DAY = Husbands Day holiday.description.IMMACULATE_CONCEPTION = Immaculate Conception Day holiday.description.IMPERIAL_DAY = Event of imperial mourning or celebration +holiday.description.INDEPENDENCE_AND_REPUBLIC_DAY = Independence and Republic Day holiday.description.INDEPENDENCE_DAY = Independence Day holiday.description.INDEP_CUENCA = Independence of Cuenca holiday.description.INDEP_GUYAQUIL = Independence of Guayaquil @@ -162,6 +169,7 @@ holiday.description.LEE_JACKSON = Lee-Jackson Day holiday.description.LEOPOLD = Leopold III. day holiday.description.LIBERATION = Liberation Day holiday.description.LINCOLN = Lincoln's Birthday +holiday.description.MAHA_SHIVRATREE = Maha Shivaratree holiday.description.MAJORITY_RULE_DAY = Majority Rule Day holiday.description.MALVINAS = Malvinas Day holiday.description.MARLBOROUGH_ANNIVERSARY = Marlborough Anniversary @@ -203,6 +211,7 @@ holiday.description.PLEBISCITE = Day of the plebiscite holiday.description.PRESEREN = Prešeren Day holiday.description.PRESIDENTS_DAY = Presidents Day holiday.description.PROCLAMATION = Proclamation Day +holiday.description.PUBLIC_HOLIDAY = Public holiday holiday.description.PULASKI = Casimir Pulaski Day holiday.description.QUEENS_BIRTHDAY = Queen's birthday holiday.description.QUEENS_PLATINUM_JUBILEE = Queen's Platinum Jubilee @@ -265,6 +274,7 @@ holiday.description.ST_VITUS = St.Vitus' Day holiday.description.SUMMER_BANK_HOLIDAY = Summer Bank Holiday holiday.description.TARANAKI_ANNIVERSARY = Taranaki Anniversary holiday.description.TERRITORY_DAY = Territory Day +holiday.description.THAIPOOSAM_CAVEDEE = Thaipoosam Cavadee holiday.description.THANKSGIVING = Thanksgiving Day holiday.description.THEOPHANY = Theophany holiday.description.THREE_HIERARCHS = The Three Holy Hierarchs @@ -277,6 +287,7 @@ holiday.description.TURKEY_DEMOCRATIC_UNITY_DAY = Democracy and National Un holiday.description.TURKEY_REPUBLIC_DAY = Republic Day holiday.description.TURKEY_VICTORY_DAY = Victory Day holiday.description.TYNWALD = Tynwald Day +holiday.description.UGAADI = Ugaadi holiday.description.UNIFICATION = Unification Day holiday.description.UNIFICATION_GERMANY = German Unity Day holiday.description.VETERANS_DAY = Veterans Day diff --git a/jollyday-core/src/main/resources/holidays/Holidays_mu.xml b/jollyday-core/src/main/resources/holidays/Holidays_mu.xml new file mode 100644 index 000000000..34d782689 --- /dev/null +++ b/jollyday-core/src/main/resources/holidays/Holidays_mu.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMUTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMUTest.java new file mode 100644 index 000000000..258f40332 --- /dev/null +++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMUTest.java @@ -0,0 +1,67 @@ +package de.focus_shift.jollyday.tests.country; + +import de.focus_shift.jollyday.core.Holiday; +import de.focus_shift.jollyday.core.HolidayCalendar; +import de.focus_shift.jollyday.core.HolidayManager; +import de.focus_shift.jollyday.core.ManagerParameters; +import de.focus_shift.jollyday.tests.country.base.AbstractCountryTestBase; +import de.focus_shift.jollyday.core.util.CalendarUtil; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import java.time.LocalDate; +import java.util.List; +import java.util.Locale; +import java.util.Set; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.fail; + +public class HolidayMUTest extends AbstractCountryTestBase { + + private static final String ISO_CODE = "mu"; + + private final CalendarUtil calendarUtil = new CalendarUtil(); + + @ParameterizedTest + @ValueSource(ints = {2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024}) + void testManagerVGStructure(final int year) { + validateCalendarData(ISO_CODE, year, true); + } + + @Test + void testManagerVGInterval() { + try { + final HolidayManager instance = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.MAURITIUS, null)); + final LocalDate startDateInclusive = calendarUtil.create(2022, 10, 1); + final LocalDate endDateInclusive = calendarUtil.create(2023, 1, 31); + final Set holidays = instance.getHolidays(startDateInclusive, endDateInclusive); + final List expected = List.of(calendarUtil.create(2022, 10, 24), + calendarUtil.create(2022, 11, 2), calendarUtil.create(2022, 12, 25), + calendarUtil.create(2023, 1, 1), calendarUtil.create(2023, 1, 2), + calendarUtil.create(2023, 1, 3), calendarUtil.create(2023, 1, 22)); + assertThat(holidays).hasSameSizeAs(expected); + for (LocalDate d : expected) { + assertThat(calendarUtil.contains(holidays, d)).isTrue(); + } + } catch (Exception e) { + fail("Unexpected error occurred: " + e.getClass().getName() + " - " + e.getMessage()); + } + } + + @Test + void testManagerDifferentInstance() { + final Locale defaultLocale = Locale.getDefault(); + Locale.setDefault(Locale.US); + try { + final HolidayManager defaultManager = HolidayManager.getInstance(); + final HolidayManager virginIslandsManager = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.MAURITIUS, null)); + assertThat(defaultManager).isNotEqualTo(virginIslandsManager); + } catch (Exception e) { + fail("Unexpected error occurred: " + e.getClass().getName() + " - " + e.getMessage()); + } finally { + Locale.setDefault(defaultLocale); + } + } +} diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2013.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2013.xml new file mode 100644 index 000000000..61e4983f5 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2013.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2014.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2014.xml new file mode 100644 index 000000000..83e5a5afd --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2014.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2015.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2015.xml new file mode 100644 index 000000000..bb745e10f --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2015.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2016.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2016.xml new file mode 100644 index 000000000..cb247f51d --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2016.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2017.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2017.xml new file mode 100644 index 000000000..1309dee41 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2017.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2018.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2018.xml new file mode 100644 index 000000000..da02bf5b5 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2018.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2019.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2019.xml new file mode 100644 index 000000000..90565d627 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2019.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2020.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2020.xml new file mode 100644 index 000000000..06ba818a9 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2020.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2021.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2021.xml new file mode 100644 index 000000000..b19dcddd2 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2021.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2022.xml new file mode 100644 index 000000000..84e845765 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2022.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2023.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2023.xml new file mode 100644 index 000000000..b916a6fe4 --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2023.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2024.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2024.xml new file mode 100644 index 000000000..bc5e1b3bf --- /dev/null +++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_mu_2024.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + From 97169118b7733398d40cdcb02cb6fc8d0636803f Mon Sep 17 00:00:00 2001 From: XSpielinbox <55600187+xspielinbox@users.noreply.github.com> Date: Thu, 24 Aug 2023 14:08:07 +0200 Subject: [PATCH 2/5] Fix reverse Cycle Parser Signed-off-by: XSpielinbox <55600187+xspielinbox@users.noreply.github.com> --- .../core/parser/predicates/ValidCycle.java | 47 ++++++++++--------- .../jollyday/tests/impl/FixedParserTest.java | 45 +++++++++++++++++- 2 files changed, 70 insertions(+), 22 deletions(-) diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java index c7b964975..252cafb7d 100644 --- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java +++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java @@ -22,30 +22,35 @@ public boolean test(Limited limited) { case EVEN_YEARS: return year % 2 == 0; default: + int cycleYears; + switch (limited.cycle()) { + case TWO_YEARS: + cycleYears = 2; + break; + case THREE_YEARS: + cycleYears = 3; + break; + case FOUR_YEARS: + cycleYears = 4; + break; + case FIVE_YEARS: + cycleYears = 5; + break; + case SIX_YEARS: + cycleYears = 6; + break; + default: + throw new IllegalArgumentException("Cannot handle unknown cycle type '" + limited.cycle() + "'."); + } if (limited.validFrom() != null) { - int cycleYears; - switch (limited.cycle()) { - case TWO_YEARS: - cycleYears = 2; - break; - case THREE_YEARS: - cycleYears = 3; - break; - case FOUR_YEARS: - cycleYears = 4; - break; - case FIVE_YEARS: - cycleYears = 5; - break; - case SIX_YEARS: - cycleYears = 6; - break; - default: - throw new IllegalArgumentException("Cannot handle unknown cycle type '" + limited.cycle() + "'."); - } + // no need to test whether we are in range, as this is already done in ValidFromTo return (year - limited.validFrom().getValue()) % cycleYears == 0; + } else if (limited.validTo() != null) { + // no need to test whether we are in range, as this is already done in ValidFromTo + return (limited.validTo().getValue() - year) % cycleYears == 0; + } else { + throw new IllegalArgumentException("Cannot handle cycle type '" + limited.cycle() + "' without any reference year."); } } - return true; } } diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/impl/FixedParserTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/impl/FixedParserTest.java index 86ecafde2..4367e0bd3 100644 --- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/impl/FixedParserTest.java +++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/impl/FixedParserTest.java @@ -60,7 +60,7 @@ void testFixedWithMoving() { } @Test - void testCycle2YearsInvalid() { + void testCycle2YearsInvalidRepeat() { final Fixed fixed = createFixed(4, JANUARY); fixed.setValidFrom(2010); fixed.setEvery(HolidayCycleType.TWO_YEARS); @@ -70,6 +70,17 @@ void testCycle2YearsInvalid() { assertThat(holidays).isEmpty(); } + @Test + void testCycle2YearsReverseInvalidRepeat() { + final Fixed fixed = createFixed(4, JANUARY); + fixed.setValidTo(2010); + fixed.setEvery(HolidayCycleType.TWO_YEARS); + final Holidays config = createHolidays(fixed); + + final List holidays = sut.parse(2009, new JaxbHolidays(config)); + assertThat(holidays).isEmpty(); + } + @Test void testCycle3Years() { final Fixed fixed = createFixed(4, JANUARY); @@ -80,6 +91,38 @@ void testCycle3Years() { assertThat(holidays).hasSize(1); } + @Test + void testCycle3YearsReverse() { + final Fixed fixed = createFixed(4, JANUARY); + fixed.setValidTo(2010); + fixed.setEvery(HolidayCycleType.THREE_YEARS); + final Holidays config = createHolidays(fixed); + final List holidays = sut.parse(2007, new JaxbHolidays(config)); + assertThat(holidays).hasSize(1); + } + + @Test + void testCycle5YearsInvalidBeforeStart() { + final Fixed fixed = createFixed(4, JANUARY); + fixed.setValidFrom(2010); + fixed.setEvery(HolidayCycleType.TWO_YEARS); + final Holidays config = createHolidays(fixed); + + final List holidays = sut.parse(2005, new JaxbHolidays(config)); + assertThat(holidays).isEmpty(); + } + + @Test + void testCycle5YearsReverseInvalidAfterEnd() { + final Fixed fixed = createFixed(4, JANUARY); + fixed.setValidTo(2010); + fixed.setEvery(HolidayCycleType.FIVE_YEARS); + final Holidays config = createHolidays(fixed); + + final List holidays = sut.parse(2015, new JaxbHolidays(config)); + assertThat(holidays).isEmpty(); + } + private void containsAll(List list, LocalDate... dates) { assertThat(list).hasSameSizeAs(dates); final List expected = new ArrayList<>(Arrays.asList(dates)); From 01f38160430f9e131fee69688a97c8faf4a60578 Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Fri, 22 Sep 2023 15:06:51 +0200 Subject: [PATCH 3/5] Add ValidCycleTest --- .gitignore | 2 +- jollyday-core/pom.xml | 5 + .../core/parser/predicates/ValidCycle.java | 5 +- .../parser/predicates/ValidCycleTest.java | 235 ++++++++++++++++++ .../test/resources/junit-platform.properties | 1 + jollyday-tests/pom.xml | 1 - pom.xml | 8 + 7 files changed, 254 insertions(+), 3 deletions(-) create mode 100644 jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java create mode 100644 jollyday-core/src/test/resources/junit-platform.properties diff --git a/.gitignore b/.gitignore index e2e91dcc8..fa86076f1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ target/ .project # jqwik -/jollyday-tests/.jqwik-database +.jqwik-database diff --git a/jollyday-core/pom.xml b/jollyday-core/pom.xml index e5b01af10..d6cfe6ebe 100644 --- a/jollyday-core/pom.xml +++ b/jollyday-core/pom.xml @@ -59,6 +59,11 @@ xmlunit-core test + + net.jqwik + jqwik + test + diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java index 252cafb7d..257212507 100644 --- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java +++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java @@ -22,7 +22,8 @@ public boolean test(Limited limited) { case EVEN_YEARS: return year % 2 == 0; default: - int cycleYears; + + final int cycleYears; switch (limited.cycle()) { case TWO_YEARS: cycleYears = 2; @@ -42,6 +43,7 @@ public boolean test(Limited limited) { default: throw new IllegalArgumentException("Cannot handle unknown cycle type '" + limited.cycle() + "'."); } + if (limited.validFrom() != null) { // no need to test whether we are in range, as this is already done in ValidFromTo return (year - limited.validFrom().getValue()) % cycleYears == 0; @@ -51,6 +53,7 @@ public boolean test(Limited limited) { } else { throw new IllegalArgumentException("Cannot handle cycle type '" + limited.cycle() + "' without any reference year."); } + } } } diff --git a/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java new file mode 100644 index 000000000..adb5de03a --- /dev/null +++ b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java @@ -0,0 +1,235 @@ +package de.focus_shift.jollyday.core.parser.predicates; + + +import de.focus_shift.jollyday.core.spi.Limited; +import de.focus_shift.jollyday.core.spi.YearCycle; +import net.jqwik.api.ForAll; +import net.jqwik.api.Property; +import net.jqwik.time.api.constraints.YearRange; + +import java.time.Year; + +import static org.assertj.core.api.Assertions.assertThat; + +class ValidCycleTest { + + @Property + void ensureLimitedForEveryYearReturnsTrue(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return null; + } + + @Override + public Year validTo() { + return null; + } + + @Override + public YearCycle cycle() { + return YearCycle.EVERY_YEAR; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + assertThat(validCycle.test(limited)).isTrue(); + } + + @Property + void ensureLimitedForOddYearReturnsTrue(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return null; + } + + @Override + public Year validTo() { + return null; + } + + @Override + public YearCycle cycle() { + return YearCycle.ODD_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 2 != 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForEvenYearReturnsTrue(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return null; + } + + @Override + public Year validTo() { + return null; + } + + @Override + public YearCycle cycle() { + return YearCycle.EVEN_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 2 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForTwoYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return Year.of(1800); + } + + @Override + public Year validTo() { + return Year.of(3000); + } + + @Override + public YearCycle cycle() { + return YearCycle.TWO_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 2 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForThreeYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return Year.of(1800); + } + + @Override + public Year validTo() { + return Year.of(3000); + } + + @Override + public YearCycle cycle() { + return YearCycle.THREE_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 3 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForFourYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return Year.of(1800); + } + + @Override + public Year validTo() { + return Year.of(3000); + } + + @Override + public YearCycle cycle() { + return YearCycle.FOUR_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 4 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForFiveYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return Year.of(1800); + } + + @Override + public Year validTo() { + return Year.of(3000); + } + + @Override + public YearCycle cycle() { + return YearCycle.FIVE_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 5 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } + + @Property + void ensureLimitedForSixYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + + final Limited limited = new Limited() { + @Override + public Year validFrom() { + return Year.of(1800); + } + + @Override + public Year validTo() { + return Year.of(3000); + } + + @Override + public YearCycle cycle() { + return YearCycle.SIX_YEARS; + } + }; + + final ValidCycle validCycle = new ValidCycle(year.getValue()); + if (year.getValue() % 6 == 0) { + assertThat(validCycle.test(limited)).isTrue(); + } else { + assertThat(validCycle.test(limited)).isFalse(); + } + } +} diff --git a/jollyday-core/src/test/resources/junit-platform.properties b/jollyday-core/src/test/resources/junit-platform.properties new file mode 100644 index 000000000..e739d56b2 --- /dev/null +++ b/jollyday-core/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +jqwik.reporting.onlyfailures = true diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml index 027eadb71..6c6286553 100644 --- a/jollyday-tests/pom.xml +++ b/jollyday-tests/pom.xml @@ -48,7 +48,6 @@ net.jqwik jqwik - 1.8.0 test diff --git a/pom.xml b/pom.xml index 3ea78923b..c9de27afa 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 5.10.0 5.5.0 3.24.2 + 1.8.0 @@ -115,6 +116,13 @@ test + + net.jqwik + jqwik + ${jqwik.version} + test + + From e8469c7849e5843f4b72b9b9e2a7ac48844d9f1e Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Fri, 22 Sep 2023 15:27:31 +0200 Subject: [PATCH 4/5] Improve ValidCycle and add further tests --- .../core/parser/predicates/ValidCycle.java | 60 ++++----- .../parser/predicates/ValidCycleTest.java | 127 +++++++----------- 2 files changed, 78 insertions(+), 109 deletions(-) diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java index 257212507..0be0ce9db 100644 --- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java +++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycle.java @@ -21,39 +21,37 @@ public boolean test(Limited limited) { return year % 2 != 0; case EVEN_YEARS: return year % 2 == 0; + case TWO_YEARS: + return isValidWithReferenceYear(limited, 2); + case THREE_YEARS: + return isValidWithReferenceYear(limited, 3); + case FOUR_YEARS: + return isValidWithReferenceYear(limited, 4); + case FIVE_YEARS: + return isValidWithReferenceYear(limited, 5); + case SIX_YEARS: + return isValidWithReferenceYear(limited, 6); default: + throw new IllegalArgumentException("Cannot handle unknown cycle type '" + limited.cycle() + "'."); + } + } - final int cycleYears; - switch (limited.cycle()) { - case TWO_YEARS: - cycleYears = 2; - break; - case THREE_YEARS: - cycleYears = 3; - break; - case FOUR_YEARS: - cycleYears = 4; - break; - case FIVE_YEARS: - cycleYears = 5; - break; - case SIX_YEARS: - cycleYears = 6; - break; - default: - throw new IllegalArgumentException("Cannot handle unknown cycle type '" + limited.cycle() + "'."); - } - - if (limited.validFrom() != null) { - // no need to test whether we are in range, as this is already done in ValidFromTo - return (year - limited.validFrom().getValue()) % cycleYears == 0; - } else if (limited.validTo() != null) { - // no need to test whether we are in range, as this is already done in ValidFromTo - return (limited.validTo().getValue() - year) % cycleYears == 0; - } else { - throw new IllegalArgumentException("Cannot handle cycle type '" + limited.cycle() + "' without any reference year."); - } - + /** + * Will validate if a given year based on the reference year (validFrom/validTo) is valid bases on the cycle strategy. + *

+ * Note: no need to test whether we are in range, as this is already done in {@link ValidFromTo} + * + * @param limited provides the reference years. First we use validFrom and if not given validTo + * @param cycleYears number of years to start the cycle starting from validFrom/validTo + * @return true if the given year based on validFrom/validTo and the cycle is valid, otherwise false + */ + private boolean isValidWithReferenceYear(Limited limited, int cycleYears) { + if (limited.validFrom() != null) { + return (year - limited.validFrom().getValue()) % cycleYears == 0; + } else if (limited.validTo() != null) { + return (limited.validTo().getValue() - year) % cycleYears == 0; } + + throw new IllegalArgumentException("Cannot handle cycle type '" + limited.cycle() + "' without any reference year."); } } diff --git a/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java index adb5de03a..ecc2ef583 100644 --- a/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java +++ b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/parser/predicates/ValidCycleTest.java @@ -3,13 +3,17 @@ import de.focus_shift.jollyday.core.spi.Limited; import de.focus_shift.jollyday.core.spi.YearCycle; +import net.jqwik.api.Arbitraries; +import net.jqwik.api.Arbitrary; import net.jqwik.api.ForAll; import net.jqwik.api.Property; +import net.jqwik.api.Provide; import net.jqwik.time.api.constraints.YearRange; import java.time.Year; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; class ValidCycleTest { @@ -94,142 +98,109 @@ public YearCycle cycle() { } @Property - void ensureLimitedForTwoYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + void ensureLimitedWithCycleYearsWithValidFrom(@ForAll @YearRange(min = 1901) Year year, @ForAll("onlyYearBased") YearCycle cycle) { - final Limited limited = new Limited() { - @Override - public Year validFrom() { - return Year.of(1800); - } - - @Override - public Year validTo() { - return Year.of(3000); - } - - @Override - public YearCycle cycle() { - return YearCycle.TWO_YEARS; - } - }; - - final ValidCycle validCycle = new ValidCycle(year.getValue()); - if (year.getValue() % 2 == 0) { - assertThat(validCycle.test(limited)).isTrue(); - } else { - assertThat(validCycle.test(limited)).isFalse(); - } - } - - @Property - void ensureLimitedForThreeYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + final int modulo = getModulo(cycle); final Limited limited = new Limited() { @Override public Year validFrom() { - return Year.of(1800); + return Year.of(1901); } @Override public Year validTo() { - return Year.of(3000); + return null; } @Override public YearCycle cycle() { - return YearCycle.THREE_YEARS; + return cycle; } }; final ValidCycle validCycle = new ValidCycle(year.getValue()); - if (year.getValue() % 3 == 0) { - assertThat(validCycle.test(limited)).isTrue(); - } else { - assertThat(validCycle.test(limited)).isFalse(); - } + assertThat(validCycle.test(limited)).isEqualTo(((year.getValue() - limited.validFrom().getValue()) % modulo) == 0); } @Property - void ensureLimitedForFourYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + void ensureLimitedForTwoYearReturnsTrueWithValidTo(@ForAll @YearRange(max = 2013) Year year, @ForAll("onlyYearBased") YearCycle cycle) { + + final int modulo = getModulo(cycle); final Limited limited = new Limited() { @Override public Year validFrom() { - return Year.of(1800); + return null; } @Override public Year validTo() { - return Year.of(3000); + return Year.of(2013); } @Override public YearCycle cycle() { - return YearCycle.FOUR_YEARS; + return cycle; } }; final ValidCycle validCycle = new ValidCycle(year.getValue()); - if (year.getValue() % 4 == 0) { - assertThat(validCycle.test(limited)).isTrue(); - } else { - assertThat(validCycle.test(limited)).isFalse(); - } + assertThat(validCycle.test(limited)).isEqualTo(((limited.validTo().getValue() - year.getValue()) % modulo) == 0); } - @Property - void ensureLimitedForFiveYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { - - final Limited limited = new Limited() { - @Override - public Year validFrom() { - return Year.of(1800); - } - - @Override - public Year validTo() { - return Year.of(3000); - } - - @Override - public YearCycle cycle() { - return YearCycle.FIVE_YEARS; - } - }; + @Provide + Arbitrary onlyYearBased() { + return Arbitraries.of(YearCycle.TWO_YEARS, YearCycle.THREE_YEARS, YearCycle.FOUR_YEARS, YearCycle.FIVE_YEARS, YearCycle.SIX_YEARS); + } - final ValidCycle validCycle = new ValidCycle(year.getValue()); - if (year.getValue() % 5 == 0) { - assertThat(validCycle.test(limited)).isTrue(); - } else { - assertThat(validCycle.test(limited)).isFalse(); + private static int getModulo(YearCycle cycle) { + int modulo = 0; + switch (cycle){ + case TWO_YEARS: + modulo = 2; + break; + case THREE_YEARS: + modulo = 3; + break; + case FOUR_YEARS: + modulo = 4; + break; + case FIVE_YEARS: + modulo = 5; + break; + case SIX_YEARS: + modulo = 6; + break; } + return modulo; } @Property - void ensureLimitedForSixYearReturnsTrueWithValidFromAndValidTo(@ForAll @YearRange Year year) { + void ensureLimitedForTwoYearReturnsTrueWithoutValidFromAndValidTo(@ForAll @YearRange Year year) { final Limited limited = new Limited() { @Override public Year validFrom() { - return Year.of(1800); + return null; } @Override public Year validTo() { - return Year.of(3000); + return null; } @Override public YearCycle cycle() { - return YearCycle.SIX_YEARS; + return YearCycle.TWO_YEARS; } }; final ValidCycle validCycle = new ValidCycle(year.getValue()); - if (year.getValue() % 6 == 0) { - assertThat(validCycle.test(limited)).isTrue(); - } else { - assertThat(validCycle.test(limited)).isFalse(); - } + final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, + () -> validCycle.test(limited) + ); + + assertThat(thrown.getMessage()).isEqualTo("Cannot handle cycle type 'TWO_YEARS' without any reference year."); } } From c1a3603e85802e86a5bdca6733af63a4942a9c6c Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Fri, 22 Sep 2023 16:49:30 +0200 Subject: [PATCH 5/5] Improve translations --- .../country_descriptions_nl.properties | 4 +- .../holiday_descriptions_de.properties | 11 + .../holiday_descriptions_el.properties | 595 +++++++++--------- .../jollyday/tests/country/UtilTest.java | 2 +- 4 files changed, 317 insertions(+), 295 deletions(-) diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties index 060ba14e2..dea654cbe 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties @@ -104,10 +104,10 @@ country.description.ch.bs = Basel-City country.description.ch.fr = Fribourg country.description.ch.ge = Geneva country.description.ch.gl = Glarus -country.description.ch.gr = Graub�nden +country.description.ch.gr = Graubünden country.description.ch.ju = Jura country.description.ch.lu = Lucerne -country.description.ch.ne = Neuch�tel +country.description.ch.ne = Neuchâtel country.description.ch.nw = Nidwalden country.description.ch.ow = Obwalden country.description.ch.sg = St.Gallen 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 f1b5a6b58..55469bdbe 100644 --- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties +++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties @@ -1,5 +1,6 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA = 170. Jahrestag der Ankunft der ersten portugiesischen Einwanderer auf den Bermudas holiday.description.1949_GREAT_MARCH_AND_RESTORATION = Das Gedenken an den Großen Marsch von 1949 und die Wiedereinsetzung des Legislativrats +holiday.description.ABOLITION_OF_SLAVERY = Aufhebung der Sklaverei holiday.description.ADELAIDE_CUP = Adelaide Cup holiday.description.AE_COMMEMORATION_DAY = Commemoration Day holiday.description.AFL = AFL Grand Final Friday @@ -15,7 +16,9 @@ holiday.description.APARECIDA = Erscheinung der Gottesmut holiday.description.ARBOR = Arbor Tag holiday.description.ARMISTICE = Waffenstillstand holiday.description.ARMY_DAY = Tag des Heeres +holiday.description.ARRIVAL_OF_INDENTURED_LABORERS = Ankunft der Gastarbeiter holiday.description.ARTIGAS = Artigas' Geburtstag +holiday.description.ASSUMPTION_BLESSED_VIRGIN_MARY = Mariä Himmelfahrt holiday.description.ASSUMPTION_DAY = Mariä Himmelfahrt holiday.description.ASSUMPTION_MARY = Mariä Himmelfahrt holiday.description.AUCKLAND_ANNIVERSARY = Auckland Anniversary @@ -44,6 +47,7 @@ holiday.description.CESAR_CHAVEZ = César Chávez's Geburtst holiday.description.CHACO_ARMISTICE = Chaco Waffenstillstand holiday.description.CHATHAM_ISLANDS_ANNIVERSARY = Chatham Islands Anniversary holiday.description.CHILDRENS_DAY = Kindertag +holiday.description.CHINESE_SPRING_FESTIVAL = Chinesisches Frühlingsfest holiday.description.CHRISTMAS = Weihnachten holiday.description.CHRISTMAS_EVE = Heiligabend holiday.description.CITY_DAY = Hauptstadttag @@ -73,6 +77,7 @@ holiday.description.DECLARATION_OF_INDEPENDENCE_DAY = Tag der Erklärung der Un holiday.description.DEFENDER_FATHERLAND = Verteidiger des Vaterlandes holiday.description.DEFENDER_OF_UKRAINE = Tag des Verteidigers der Ukraine holiday.description.DISCOVERY_DAY = Entdeckungstag +holiday.description.DIVALI = Divali holiday.description.EARLY_MAY_BANK_HOLIDAY = Early May Bank Holiday holiday.description.EDU_CULTURE = Bildungs-, Kultur- und Literatur-Tag holiday.description.EGYPT_23_JULY_REVOLUTION = July 23rd Revolution Day @@ -111,6 +116,7 @@ holiday.description.FREEDOM = Tag der Freiheit holiday.description.FREEDOM_DEMOCRACY = Freiheit und Demokratie Tag holiday.description.FUNERAL_OF_PRESIDENT_REAGAN = Beerdigung von Präsident Reagan holiday.description.GALICIAN_LITERATURE = Galizischer Literatur Tag +holiday.description.GANESH_CHATURTHI = Ganesh Chaturthi holiday.description.GENEVAN_FAST = Genevan Fast holiday.description.GHANDIS_BIRTHDAY = Ghandis Geburtstag holiday.description.GOODWILL = Tag des Wohlwollens @@ -130,6 +136,7 @@ holiday.description.HUS = Jan Hus Tag holiday.description.HUSBANDS_DAY = Ehemanntag holiday.description.IMMACULATE_CONCEPTION = Maria Empfängnis holiday.description.IMPERIAL_DAY = Ereignis kaiserlicher Feierlichkeiten +holiday.description.INDEPENDENCE_AND_REPUBLIC_DAY = Tag der Unabhüngigkeit und der Republik holiday.description.INDEPENDENCE_DAY = Unabhängigkeitstag holiday.description.INDEP_CUENCA = Unabhängigkeit von Cuenca holiday.description.INDEP_GUYAQUIL = Unabhängigkeit von Guayaquil @@ -162,6 +169,7 @@ holiday.description.LEE_JACKSON = Lee-Jackson Tag holiday.description.LEOPOLD = Leopold III. Tag holiday.description.LIBERATION = Tag der Befreiung holiday.description.LINCOLN = Lincolns Geburtstag +holiday.description.MAHA_SHIVRATREE = Maha Shivaratree holiday.description.MAJORITY_RULE_DAY = Tag der Mehrheitsregelungen holiday.description.MALVINAS = Malvinas Tag holiday.description.MARLBOROUGH_ANNIVERSARY = Marlborough Anniversary @@ -203,6 +211,7 @@ holiday.description.PLEBISCITE = Tag der Volksabstimmung holiday.description.PRESEREN = Prešeren Tag holiday.description.PRESIDENTS_DAY = Presidents Day holiday.description.PROCLAMATION = Proklamationstag +holiday.description.PUBLIC_HOLIDAY = Nationaler Feiertag holiday.description.PULASKI = Casimir Pulaski Tag holiday.description.QUEENS_BIRTHDAY = Geburtstag der Königin holiday.description.QUEENS_PLATINUM_JUBILEE = Queen's Platinum Jubilee @@ -265,6 +274,7 @@ holiday.description.ST_VITUS = St.Vitus' Tag holiday.description.SUMMER_BANK_HOLIDAY = Summer Bank Holiday holiday.description.TARANAKI_ANNIVERSARY = Taranaki Anniversary holiday.description.TERRITORY_DAY = Territorialer Tag +holiday.description.THAIPOOSAM_CAVEDEE = Thaipoosam Cavadee holiday.description.THANKSGIVING = Erntedankfest holiday.description.THEOPHANY = Theophany holiday.description.THREE_HIERARCHS = Die 3 Heiligen @@ -277,6 +287,7 @@ holiday.description.TURKEY_DEMOCRATIC_UNITY_DAY = Democracy and National Un holiday.description.TURKEY_REPUBLIC_DAY = Tag der Republik holiday.description.TURKEY_VICTORY_DAY = Tag des Sieges holiday.description.TYNWALD = Tynwald Tag +holiday.description.UGAADI = Ugaadi holiday.description.UNIFICATION = Tag der Wiedervereinigung holiday.description.UNIFICATION_GERMANY = Tag der Deutschen Einheit holiday.description.VETERANS_DAY = Veteranen Tag 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 e54a731c1..31508dda0 100644 --- a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties +++ b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties @@ -1,334 +1,345 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA = 170η επέτειος της άφιξης των πρώτων Πορτογάλων μεταναστών στις Βερμούδες holiday.description.1949_GREAT_MARCH_AND_RESTORATION = Εορτασμός της Μεγάλης Πορείας του 1949 και της Αποκατάστασης του Νομοθετικού Συμβουλίου. -holiday.description.ADELAIDE_CUP = Adelaide Cup -holiday.description.AE_COMMEMORATION_DAY = Commemoration Day +holiday.description.ABOLITION_OF_SLAVERY = Κατάργηση της δουλείας +holiday.description.ADELAIDE_CUP = Κύπελλο Αδελαΐδας +holiday.description.AE_COMMEMORATION_DAY = Ημέρα μνήμης holiday.description.AFL = AFL Grand Final Friday -holiday.description.AIR_FORCE_DAY = Air Force day -holiday.description.ALASKA = Alaska Day -holiday.description.ALL_SAINTS = All Saints -holiday.description.ALL_SOULS = All Souls -holiday.description.ANGAMOS = Battle of Angamos -holiday.description.ANNUNCIATION = Annunciation -holiday.description.ANTI_FASCIST = Anti-Fascist Struggle Day -holiday.description.ANZAC = ANZAC day -holiday.description.APARECIDA = Our Lady of Aparecida -holiday.description.ARBOR = Arbor Day -holiday.description.ARMISTICE = Armistice Day -holiday.description.ARMY_DAY = Army Day -holiday.description.ARTIGAS = Artigas' Birthday -holiday.description.ASSUMPTION_DAY = Assumption day -holiday.description.ASSUMPTION_MARY = Assumption of Mary -holiday.description.AUCKLAND_ANNIVERSARY = Auckland Anniversary -holiday.description.BANK_HOLIDAY = Bank Holiday -holiday.description.BATTLE_BOYNE = Battle of the Boyne -holiday.description.BATTLE_JACINTO = Battle of San Jacinto -holiday.description.BEER_DAY = Beer Day -holiday.description.BENNINGTON = Battle of Bennington +holiday.description.AIR_FORCE_DAY = Ημέρα της Πολεμικής Αεροπορίας +holiday.description.ALASKA = Ημέρα Αλάσκας +holiday.description.ALL_SAINTS = Όλοι οι Άγιοι +holiday.description.ALL_SOULS = Όλες οι ψυχές +holiday.description.ANGAMOS = Μάχη του Angamos +holiday.description.ANNUNCIATION = Ευαγγελισμός της Θεοτόκου +holiday.description.ANTI_FASCIST = Ημέρα Αντιφασιστικού Αγώνα +holiday.description.ANZAC = Ημέρα ANZAC +holiday.description.APARECIDA = Η Παναγία της Απαρεκίδας = Our Lady of Aparecida +holiday.description.ARBOR = Ημέρα του δέντρου +holiday.description.ARMISTICE = Ημέρα Ανακωχής +holiday.description.ARMY_DAY = Ημέρα του Στρατού +holiday.description.ARRIVAL_OF_INDENTURED_LABORERS = Άφιξη μισθωτών εργατών +holiday.description.ARTIGAS = Γενέθλια του Artigas +holiday.description.ASSUMPTION_BLESSED_VIRGIN_MARY = Κοίμηση της Υπεραγίας Θεοτόκου +holiday.description.ASSUMPTION_DAY = Ημέρα Κοίμησης της Θεοτόκου +holiday.description.ASSUMPTION_MARY = Κοίμηση της Παναγίας +holiday.description.AUCKLAND_ANNIVERSARY = Επέτειος του Auckland +holiday.description.BANK_HOLIDAY = Τραπεζική αργία +holiday.description.BATTLE_BOYNE = Μάχη του Boyne +holiday.description.BATTLE_JACINTO = Μάχη του San Jacinto +holiday.description.BEER_DAY = Ημέρα μπύρας +holiday.description.BENNINGTON = Μάχη του Bennington holiday.description.BERMUDA_DAY = Ημέρα των Βερμούδων -holiday.description.BLACK_AWARENESS = Black Awareness Day -holiday.description.BOLIVAR = Birthday of Simón Bolivar -holiday.description.BOXING_DAY = Boxing Day -holiday.description.BOYACA = Battle of Boyacá -holiday.description.BRIDGING_HOLIDAY = Bridging Holiday -holiday.description.BROOKLY_QUEENS = Brooklyn-Queens Day -holiday.description.BUNKER_HILL = Bunker Hill Day -holiday.description.CANBERRA_DAY = Canberra Day +holiday.description.BLACK_AWARENESS = Ημέρα ευαισθητοποίησης των μαύρων +holiday.description.BOLIVAR = Γενέθλια του Σιμόν Μπολιβάρ +holiday.description.BOXING_DAY = Ημέρα Πυγμαχίας +holiday.description.BOYACA = Μάχη της Boyacá +holiday.description.BRIDGING_HOLIDAY = Γιορτή γεφύρωσης +holiday.description.BROOKLY_QUEENS = Ημέρα Brooklyn-Queens +holiday.description.BUNKER_HILL = Ημέρα του Bunker Hill +holiday.description.CANBERRA_DAY = Ημέρα της Καμπέρα holiday.description.CANDELARIA = Fiesta de la Candelaria holiday.description.CANDLEMAS = Candlemas -holiday.description.CANTERBURY_ANNIVERSARY = Canterbury Anniversary -holiday.description.CANTERBURY_SOUTH_ANNIVERSARY = South Canterbury Anniversary -holiday.description.CARABOBO = Battle of Carabobo -holiday.description.CARTAGENA = Independence of Cartagena -holiday.description.CAYMAN_THANKSGIVING = Ημέρα των Ευχαριστιών των Νήσων Κέιμαν -holiday.description.CESAR_CHAVEZ = César Chávez's Birthday -holiday.description.CHACO_ARMISTICE = Chaco Armistice -holiday.description.CHATHAM_ISLANDS_ANNIVERSARY = Chatham Islands Anniversary -holiday.description.CHILDRENS_DAY = Children's Day -holiday.description.CHRISTMAS = Christmas -holiday.description.CHRISTMAS_EVE = Christmas Eve -holiday.description.CITY_DAY = Capital day -holiday.description.CIVIC = Civic day +holiday.description.CANTERBURY_ANNIVERSARY = Επέτειος του Canterbury +holiday.description.CANTERBURY_SOUTH_ANNIVERSARY = Επέτειος του South Canterbury +holiday.description.CARABOBO = Μάχη του Carabobo +holiday.description.CARTAGENA = Ανεξαρτησία της Cartagena +holiday.description.CAYMAN_THANKSGIVING = Ημέρα των Ευχαριστιών των Νήσων Cayman +holiday.description.CESAR_CHAVEZ = Γενέθλια του César Chávez +holiday.description.CHACO_ARMISTICE = Ανακωχή στο Chaco +holiday.description.CHATHAM_ISLANDS_ANNIVERSARY = Επέτειος των Νήσων Chatham +holiday.description.CHILDRENS_DAY = Ημέρα των παιδιών +holiday.description.CHINESE_SPRING_FESTIVAL = Κινεζικό Φεστιβάλ Άνοιξης +holiday.description.CHRISTMAS = Χριστούγεννα +holiday.description.CHRISTMAS_EVE = Παραμονή Χριστουγέννων +holiday.description.CITY_DAY = Ημέρα της πρωτεύουσας +holiday.description.CIVIC = Ημέρα της πόλης holiday.description.COLONY_DAY = Ημέρα αποικίας -holiday.description.COLUMBUS_DAY = Columbus Day -holiday.description.COMING_OF_AGE = Coming Of Age Day -holiday.description.COMMERCE_DAY = Commerce Day +holiday.description.COLUMBUS_DAY = Ημέρα του Κολόμβου +holiday.description.COMING_OF_AGE = Ημέρα ενηλικίωσης +holiday.description.COMMERCE_DAY = Ημέρα Εμπορίου holiday.description.COMMONWEALTH_DAY = Ημέρα της Κοινοπολιτείας -holiday.description.CONFEDERATE = Confederate Memorial Day -holiday.description.CONSOLIDATION = Consolidation Day +holiday.description.CONFEDERATE = Ημέρα μνήμης της Συνομοσπονδίας +holiday.description.CONSOLIDATION = Ημέρα Ενοποίησης holiday.description.CONSTITUTION_COMMENCEMENT_2009 = Έναρξη ισχύος του Συντάγματος των Νήσων Καϊμάν του 2009 -holiday.description.CONSTITUTION_DAY = Constitution Day -holiday.description.CONST_REVOLUTION = Constitutionalist Revolution -holiday.description.CULTURE_DAY = Culture Day -holiday.description.CYBER_MONDAY = Cyber Monday -holiday.description.CYRUS_METHODIUS = Saints Cyril and Methodius Day -holiday.description.DAYTON = Dayton Agreement -holiday.description.DAY_AFTER_NEW_YEAR = Day after New Year -holiday.description.DAY_OF_ALBANIANS = Day of Albanians -holiday.description.DAY_OF_ASHKALI = Day of Ashkali -holiday.description.DAY_OF_BOSNIAKS = Day of Bosniaks -holiday.description.DAY_OF_PEACE = Day of peace -holiday.description.DAY_OF_THE_GORANS = Day of the Gorans -holiday.description.DAY_OF_THE_TURKS = Day of the Turks -holiday.description.DECLARATION_OF_INDEPENDENCE_DAY = Declaration of Independence day -holiday.description.DEFENDER_FATHERLAND = Defender of the Fatherland -holiday.description.DEFENDER_OF_UKRAINE = Defender of Ukraine Day -holiday.description.DISCOVERY_DAY = Ημέρα ανακάλυψης -holiday.description.EARLY_MAY_BANK_HOLIDAY = Early May Bank Holiday -holiday.description.EDU_CULTURE = Education, Culture and Literature Day -holiday.description.EGYPT_23_JULY_REVOLUTION = July 23rd Revolution Day -holiday.description.EGYPT_25_JAN_REVOLUTION = January 25th Revolution Day -holiday.description.EGYPT_30_JUNE_REVOLUTION = June 30th Revolution Day -holiday.description.EGYPT_ARMED_FORCES_DAY = Armed Forces Day -holiday.description.EGYPT_COPTIC_CHRISTMAS = Coptic Christmas Day -holiday.description.EGYPT_SINAI_LIBERATION = Sinai Liberation Day -holiday.description.EIGHT = Eight hours day +holiday.description.CONSTITUTION_DAY = Ημέρα Συντάγματος +holiday.description.CONST_REVOLUTION = Συνταγματική Επανάσταση +holiday.description.CULTURE_DAY = Ημέρα Πολιτισμού +holiday.description.CYBER_MONDAY = Κυβερνο-Δευτέρα +holiday.description.CYRUS_METHODIUS = Ημέρα των Αγίων Κυρίλλου και Μεθοδίου +holiday.description.DAYTON = Συμφωνία του Dayton +holiday.description.DAY_AFTER_NEW_YEAR = Ημέρα μετά την Πρωτοχρονιά +holiday.description.DAY_OF_ALBANIANS = Ημέρα των Αλβανών +holiday.description.DAY_OF_ASHKALI = Ημέρα της Ashkali +holiday.description.DAY_OF_BOSNIAKS = Ημέρα των Βόσνιων +holiday.description.DAY_OF_PEACE = Ημέρα της ειρήνης +holiday.description.DAY_OF_THE_GORANS = Ημέρα των Gorans +holiday.description.DAY_OF_THE_TURKS = Ημέρα των Τούρκων +holiday.description.DECLARATION_OF_INDEPENDENCE_DAY = Ημέρα της Διακήρυξης της Ανεξαρτησίας +holiday.description.DEFENDER_FATHERLAND = Υπερασπιστής της πατρίδας +holiday.description.DEFENDER_OF_UKRAINE = Ημέρα υπερασπιστή της Ουκρανίας +holiday.description.DISCOVERY_DAY = Ημέρα Ανακάλυψης +holiday.description.DIVALI = Divali +holiday.description.EARLY_MAY_BANK_HOLIDAY = Αργία στις αρχές Μαΐου +holiday.description.EDU_CULTURE = Ημέρα εκπαίδευσης, πολιτισμού και λογοτεχνίας +holiday.description.EGYPT_23_JULY_REVOLUTION = Ημέρα επανάστασης της 23ης Ιουλίου +holiday.description.EGYPT_25_JAN_REVOLUTION = Ημέρα επανάστασης της 25ης Ιανουαρίου +holiday.description.EGYPT_30_JUNE_REVOLUTION = Ημέρα επανάστασης της 30ής Ιουνίου +holiday.description.EGYPT_ARMED_FORCES_DAY = Ημέρα των Ενόπλων Δυνάμεων +holiday.description.EGYPT_COPTIC_CHRISTMAS = Ημέρα των Κοπτών Χριστουγέννων +holiday.description.EGYPT_SINAI_LIBERATION = Ημέρα απελευθέρωσης του Σινά +holiday.description.EIGHT = Ημέρα οκτώ ωρών holiday.description.EKKA = Ekka Wednesday -holiday.description.ELECTION_DAY = Election day +holiday.description.ELECTION_DAY = Ημέρα εκλογών holiday.description.EMANCIPATION_DAY = Ημέρα χειραφέτησης holiday.description.EMANCIPATION_MONDAY = Δευτέρα της χειραφέτησης holiday.description.EMANCIPATION_TUESDAY = Τρίτη της χειραφέτησης -holiday.description.EMANCIPATION_WEDNESDAY = Τετάρτη χειραφέτησης -holiday.description.EMPERORS_BIRTHDAY = Emperors Birthday -holiday.description.EMPIRE = Empire Day -holiday.description.EPIPHANY = Epiphany -holiday.description.EUROPE_DAY = Europe Day -holiday.description.EVACUATION = Evacuation Day -holiday.description.FAMILY_COMMUNITY = Family & Community day -holiday.description.FAMILY_DAY = Family day -holiday.description.FARROUS_REVOLUTION = Farroupilha's Revolution -holiday.description.FEDERAL_DAY_THANKSGIVING_MON = Monday of Federal Day of Thanksgiving, Repentance and Prayer +holiday.description.EMANCIPATION_WEDNESDAY = Τετάρτη της χειραφέτησης +holiday.description.EMPERORS_BIRTHDAY = Τα γενέθλια του αυτοκράτορα +holiday.description.EMPIRE = Ημέρα Αυτοκρατορίας +holiday.description.EPIPHANY = Θεοφάνεια +holiday.description.EUROPE_DAY = Ημέρα της Ευρώπης +holiday.description.EVACUATION = Ημέρα εκκένωσης +holiday.description.FAMILY_COMMUNITY = Ημέρα οικογένειας και κοινότητας +holiday.description.FAMILY_DAY = Ημέρα οικογένειας +holiday.description.FARROUS_REVOLUTION = Επανάσταση της Farroupilha +holiday.description.FEDERAL_DAY_THANKSGIVING_MON = Δευτέρα της ομοσπονδιακής ημέρας ευχαριστιών, μετάνοιας και προσευχής holiday.description.FESTIVAL_MONDAY = Δευτέρα του Φεστιβάλ holiday.description.FESTIVAL_TUESDAY = Φεστιβάλ Τρίτης holiday.description.FESTIVAL_WEDNESDAY = Φεστιβάλ Τετάρτης -holiday.description.FIRST_CHRISTMAS_DAY = 1st Christmas day -holiday.description.FIRST_DAY_SUMMER = First Day of Summer -holiday.description.FLAG_DAY = National Flag Day -holiday.description.FLORIAN = Florian of Lorch's day -holiday.description.FOUNDATION = Foundation Day -holiday.description.FOUNDING_ASUNCION = Founding of Asunción -holiday.description.FOUND_QUITO = Foundation of Quito -holiday.description.FREEDOM = Freedom Day -holiday.description.FREEDOM_DEMOCRACY = Freedom and Democracy Day -holiday.description.FUNERAL_OF_PRESIDENT_REAGAN = Funeral of President Reagan -holiday.description.GALICIAN_LITERATURE = Galician Literature Day -holiday.description.GENEVAN_FAST = Genevan Fast -holiday.description.GHANDIS_BIRTHDAY = Ghandis birthday -holiday.description.GOODWILL = Day of Goodwill -holiday.description.GOVERNMENT_CHANGE = Change of Federal Government -holiday.description.GREENERY_DAY = Greenery Day -holiday.description.GUANACASTE = Guanacaste Day -holiday.description.HAWKES_BAY_ANNIVERSARY = Hawke's Bay Anniversary -holiday.description.HEALTH_SPORTS = Health and Sports Day -holiday.description.HERITAGE = Heritage day -holiday.description.HEROES = Heroes' Day +holiday.description.FIRST_CHRISTMAS_DAY = 1η ημέρα των Χριστουγέννων +holiday.description.FIRST_DAY_SUMMER = Πρώτη ημέρα του καλοκαιριού +holiday.description.FLAG_DAY = Ημέρα της Εθνικής Σημαίας +holiday.description.FLORIAN = Ημέρα του Florian of Lorch +holiday.description.FOUNDATION = Ημέρα του Ιδρύματος +holiday.description.FOUNDING_ASUNCION = Ίδρυση της Asunción +holiday.description.FOUND_QUITO = Ίδρυση του Κίτο +holiday.description.FREEDOM = Ημέρα Ελευθερίας +holiday.description.FREEDOM_DEMOCRACY = Ημέρα Ελευθερίας και Δημοκρατίας +holiday.description.FUNERAL_OF_PRESIDENT_REAGAN = Κηδεία του προέδρου Reagan +holiday.description.GALICIAN_LITERATURE = Ημέρα Γαλικιανής Λογοτεχνίας +holiday.description.GANESH_CHATURTHI = Γκανές Τσατούρτι +holiday.description.GENEVAN_FAST = Γένοβα νηστεία +holiday.description.GHANDIS_BIRTHDAY = Γενέθλια του Ghandis +holiday.description.GOODWILL = Ημέρα καλής θέλησης +holiday.description.GOVERNMENT_CHANGE = Αλλαγή της ομοσπονδιακής κυβέρνησης +holiday.description.GREENERY_DAY = Ημέρα πρασίνου +holiday.description.GUANACASTE = Ημέρα Guanacaste +holiday.description.HAWKES_BAY_ANNIVERSARY = Επέτειος του Hawke's Bay +holiday.description.HEALTH_SPORTS = Ημέρα Υγείας και Αθλητισμού +holiday.description.HERITAGE = Ημέρα πολιτιστικής κληρονομιάς +holiday.description.HEROES = Ημέρα Ηρώων holiday.description.HEROES_AND_FOREPARENTS_DAY = Ημέρα ηρώων και προγόνων holiday.description.HOBART = Royal Hobart Regatta -holiday.description.HOMECOMING = Homecoming Day -holiday.description.HUMAN_RIGHTS = Human Rights Day -holiday.description.HURRICANE_SANDY = Hurricane Sandy -holiday.description.HUS = Jan Hus Day -holiday.description.HUSBANDS_DAY = Husbands Day -holiday.description.IMMACULATE_CONCEPTION = Immaculate Conception Day -holiday.description.IMPERIAL_DAY = Event of imperial mourning or celebration -holiday.description.INDEPENDENCE_DAY = Independence Day -holiday.description.INDEP_CUENCA = Independence of Cuenca -holiday.description.INDEP_GUYAQUIL = Independence of Guayaquil -holiday.description.INDEP_QUITO = Independence of Quito -holiday.description.INDIGENOUS_RESISTANCE = Day of the Indigenous Resistance -holiday.description.INTERNATIONAL_WOMAN = International Woman's Day -holiday.description.JEFFERSON_DAVIS = Jefferson Davis Day -holiday.description.JOAO_PESSOA_DAY = João Pessoa Death -holiday.description.JOHANNIS_DAY = Johannis day +holiday.description.HOMECOMING = Ημέρα επιστροφής στην πατρίδα +holiday.description.HUMAN_RIGHTS = Ημέρα Ανθρωπίνων Δικαιωμάτων +holiday.description.HURRICANE_SANDY = Τυφώνας Sandy +holiday.description.HUS = Ημέρα του Jan Hus +holiday.description.HUSBANDS_DAY = Ημέρα των συζύγων +holiday.description.IMMACULATE_CONCEPTION = Ημέρα Άμωμης Σύλληψης +holiday.description.IMPERIAL_DAY = Γεγονός αυτοκρατορικού πένθους ή εορτασμού +holiday.description.INDEPENDENCE_AND_REPUBLIC_DAY = Ημέρα Ανεξαρτησίας και Δημοκρατίας +holiday.description.INDEPENDENCE_DAY = Ημέρα Ανεξαρτησίας +holiday.description.INDEP_CUENCA = Ανεξαρτησία της Cuenca +holiday.description.INDEP_GUYAQUIL = Ανεξαρτησία της Guayaquil +holiday.description.INDEP_QUITO = Ανεξαρτησία του Κίτο +holiday.description.INDIGENOUS_RESISTANCE = Ημέρα της Αντίστασης των Ιθαγενών +holiday.description.INTERNATIONAL_WOMAN = Διεθνής Ημέρα της Γυναίκας +holiday.description.JEFFERSON_DAVIS = Ημέρα του Jefferson Davis +holiday.description.JOAO_PESSOA_DAY = Θάνατος του João Pessoa +holiday.description.JOHANNIS_DAY = Ημέρα Johannis holiday.description.JONSMESSA = Jónsmessa -holiday.description.JOSEFS_DAY = Josef of Nazaret Day -holiday.description.JUAN_SANTAMARIA = Juan Santamaria's day -holiday.description.JUAREZ_BIRTHDAY = Benito Juárez's birthday +holiday.description.JOSEFS_DAY = Ημέρα του Ιωσήφ του Ναζαρέτ +holiday.description.JUAN_SANTAMARIA = Ημέρα του Juan Santamaria +holiday.description.JUAREZ_BIRTHDAY = Τα γενέθλια του Benito Juárez holiday.description.JUNETEENTH = Juneteenth -holiday.description.KALANIANAOLE = Prince Jonah Kuhio Kalanianaole Day -holiday.description.KAMEHAMEHA = Kamehameha Day -holiday.description.KINGS_CORONATION = King's Coronation -holiday.description.KINGS_DAY = Kings' Birthday -holiday.description.KINGS_FEAST = King's Feast -holiday.description.KRUGER = Kruger Day -holiday.description.LABOUR_DAY = Labour day -holiday.description.LADY_APRESENTACAO = Our Lady of Apresentação +holiday.description.KALANIANAOLE = Ημέρα του πρίγκιπα Jonah Kuhio Kalanianaole +holiday.description.KAMEHAMEHA = Ημέρα Kamehameha +holiday.description.KINGS_CORONATION = Στέψη του βασιλιά +holiday.description.KINGS_DAY = Τα γενέθλια των βασιλιάδων +holiday.description.KINGS_FEAST = Γιορτή του βασιλιά +holiday.description.KRUGER = Ημέρα Kruger +holiday.description.LABOUR_DAY = Ημέρα εργασίας +holiday.description.LADY_APRESENTACAO = Η Παναγία της Apresentação holiday.description.LADY_CONCEICAO = Our Lady of Conceição -holiday.description.LADY_GOOD_VOYAGE = Our Lady of the Good Voyage -holiday.description.LADY_LIGHT_PINE = Our Lady of the Light in the Pine -holiday.description.LANDING_33_EASTERNERS = Landing of 33 Easterners -holiday.description.LANGUAGE_DAY = National Language Day -holiday.description.LAS_PIEDRAS = Battle of Las Piedras -holiday.description.LEE_JACKSON = Lee-Jackson Day -holiday.description.LEOPOLD = Leopold III. day -holiday.description.LIBERATION = Liberation Day -holiday.description.LINCOLN = Lincoln's Birthday -holiday.description.MAJORITY_RULE_DAY = Ημέρα πλειοψηφίας -holiday.description.MALVINAS = Malvinas Day -holiday.description.MARLBOROUGH_ANNIVERSARY = Marlborough Anniversary -holiday.description.MARTINS_DAY = Martin of Tours Day -holiday.description.MARTIN_DAY = José de San Martín Day +holiday.description.LADY_GOOD_VOYAGE = Η Παναγία του καλού ταξιδιού +holiday.description.LADY_LIGHT_PINE = Η Παναγία του Φωτός στο Πεύκο +holiday.description.LANDING_33_EASTERNERS = Προσγείωση των 33 Ανατολικών +holiday.description.LANGUAGE_DAY = Εθνική Ημέρα Γλώσσας +holiday.description.LAS_PIEDRAS = Μάχη του Las Piedras +holiday.description.LEE_JACKSON = Ημέρα Lee-Jackson +holiday.description.LEOPOLD = Ημέρα Leopold III. +holiday.description.LIBERATION = Ημέρα Απελευθέρωσης +holiday.description.LINCOLN = Γενέθλια του Λίνκολν +holiday.description.MAHA_SHIVRATREE = Maha Shivaratree +holiday.description.MAJORITY_RULE_DAY = Ημέρα της πλειοψηφίας +holiday.description.MALVINAS = Ημέρα των Μαλβινών +holiday.description.MARLBOROUGH_ANNIVERSARY = Επέτειος του Marlborough +holiday.description.MARTINS_DAY = Ημέρα του Μαρτίνου της Τουρς +holiday.description.MARTIN_DAY = Ημέρα του José de San Martín holiday.description.MARTIN_LUTHER_KING = Martin Luther King, Jr. Day -holiday.description.MARTYRS_DAY = Martyrs Day -holiday.description.MARY_PRINCE_DAY = Ημέρα της Mary Prince +holiday.description.MARTYRS_DAY = Ημέρα Μαρτύρων +holiday.description.MARY_PRINCE_DAY = Ημέρα Mary Prince holiday.description.MATARIKI = Matariki -holiday.description.MAY_DAY = May Day -holiday.description.MAY_REVOLUTION = May Revolution -holiday.description.MELBOURNE_CUP = Melbourne Cup -holiday.description.MEMORIAL_DAY = Memorial Day -holiday.description.MIDSUMMER = Midsummer Day -holiday.description.MIDSUMMER_EVE = Midsummer Eve -holiday.description.MOTHERS_DAY = Mothers Day -holiday.description.MOTHER_TERESA = Beatification of Mother Teresa -holiday.description.MOUNTAIN_DAY = Mountain day -holiday.description.NATIONAL_DAY = National Day +holiday.description.MAY_DAY = Πρωτομαγιά +holiday.description.MAY_REVOLUTION = Επανάσταση του Μαΐου +holiday.description.MELBOURNE_CUP = Κύπελλο Μελβούρνης +holiday.description.MEMORIAL_DAY = Ημέρα μνήμης +holiday.description.MIDSUMMER = Καλοκαιρινή ημέρα +holiday.description.MIDSUMMER_EVE = Παραμονή Καλοκαιριού +holiday.description.MOTHERS_DAY = Ημέρα της Μητέρας +holiday.description.MOTHER_TERESA = Μακαριοποίηση της Μητέρας Τερέζας +holiday.description.MOUNTAIN_DAY = Ημέρα του βουνού +holiday.description.NATIONAL_DAY = Εθνική Ημέρα holiday.description.NATIONAL_HEROES_DAY = Ημέρα Εθνικών Ηρώων -holiday.description.NATIONAL_UPRISING = National Uprising -holiday.description.NATIVITY_LADY = Nativity of our Lady -holiday.description.NATIVITY_MARY = Nativity of Mary -holiday.description.NAVY_DAY = Navy day -holiday.description.NELSON_ANNIVERSARY = Nelson Anniversary -holiday.description.NEVADA = Nevada Day -holiday.description.NEW_YEAR = New Year -holiday.description.NEW_YEARS_EVE = New Years Eve -holiday.description.OCHI = Ochi Day -holiday.description.OCT_REVOLUTION = October Revolution Day -holiday.description.OIL_EXPROPRIATION_DAY = Oil Expropriation Day -holiday.description.OTAGO_ANNIVERSARY = Otago Anniversary -holiday.description.PATRIOT = Patriots' Day -holiday.description.PEACE = Peace Festival -holiday.description.PICHINCHA = Battle of Pichincha -holiday.description.PICNIC = Picnic Day -holiday.description.PIONEER = Pioneer Day -holiday.description.PLEBISCITE = Day of the plebiscite -holiday.description.PRESEREN = Prešeren Day -holiday.description.PRESIDENTS_DAY = Presidents Day -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 -holiday.description.REFORMATION_DAY = Reformation day -holiday.description.REGIONAL = Regional holiday -holiday.description.REMEMBERANCE_OF_PRESIDENT_FORD = Remembrance of President Ford -holiday.description.REMEMBRANCE = Remembrance day -holiday.description.REMEMBRANCE_TRUTH_JUSTICE = Day of Remembrance for Truth and Justice -holiday.description.REPENTANCE_PRAYER = Day of Repentance and Prayer -holiday.description.REPUBLIC_DAY = Republic Day -holiday.description.RESPECT_AGED_DAY = Respect-for-the-Aged Day -holiday.description.REST_INDEP = Day of Restoration of Independence -holiday.description.REVOLUTION = Revolution day -holiday.description.RIEBEECK = Van Riebeeck's Day -holiday.description.ROMA_DAY = Roma day -holiday.description.RUPERT = Rupert of Salzburg's day -holiday.description.SAINT_CLEMENT = Saint Clement of Ohrid day -holiday.description.SAINT_PAUL_SHIPWRECK = St. Paul's shipwreck +holiday.description.NATIONAL_UPRISING = Εθνική εξέγερση +holiday.description.NATIVITY_LADY = Γέννηση της Παναγίας μας +holiday.description.NATIVITY_MARY = Γέννηση της Μαρίας +holiday.description.NAVY_DAY = Ημέρα Ναυτικού +holiday.description.NELSON_ANNIVERSARY = Επέτειος του Νέλσον +holiday.description.NEVADA = Ημέρα της Νεβάδας +holiday.description.NEW_YEAR = Πρωτοχρονιά +holiday.description.NEW_YEARS_EVE = Παραμονή Πρωτοχρονιάς +holiday.description.OCHI = Ημέρα Όχης +holiday.description.OCT_REVOLUTION = Ημέρα Οκτωβριανής Επανάστασης +holiday.description.OIL_EXPROPRIATION_DAY = Ημέρα απαλλοτρίωσης πετρελαίου +holiday.description.OTAGO_ANNIVERSARY = Επέτειος Otago +holiday.description.PATRIOT = Ημέρα Πατριωτών +holiday.description.PEACE = Φεστιβάλ Ειρήνης +holiday.description.PICHINCHA = Μάχη του Pichincha +holiday.description.PICNIC = Ημέρα πικνίκ +holiday.description.PIONEER = Ημέρα Πρωτοπόρου +holiday.description.PLEBISCITE = Ημέρα του δημοψηφίσματος +holiday.description.PRESEREN = Ημέρα Prešeren +holiday.description.PRESIDENTS_DAY = Ημέρα Προέδρων +holiday.description.PROCLAMATION = Ημέρα Διακήρυξης +holiday.description.PUBLIC_HOLIDAY = Δημόσια αργία +holiday.description.PULASKI = Ημέρα Casimir Pulaski +holiday.description.QUEENS_BIRTHDAY = Γενέθλια της βασίλισσας +holiday.description.QUEENS_PLATINUM_JUBILEE = Πλατινένιο Ιωβηλαίο της Βασίλισσας +holiday.description.QUEENS_STATE_FUNERAL = Κηδεία της Πολιτείας της Βασίλισσας +holiday.description.RACE = Ημέρα του Αγώνα +holiday.description.RECONCILIATION = Ημέρα Συμφιλίωσης +holiday.description.RECREATION = Ημέρα αναψυχής +holiday.description.REFORMATION_DAY = Ημέρα αναμόρφωσης +holiday.description.REGIONAL = Περιφερειακή αργία +holiday.description.REMEMBERANCE_OF_PRESIDENT_FORD = Μνήμη του Προέδρου Ford +holiday.description.REMEMBRANCE = Ημέρα μνήμης +holiday.description.REMEMBRANCE_TRUTH_JUSTICE = Ημέρα Μνήμης για την Αλήθεια και τη Δικαιοσύνη +holiday.description.REPENTANCE_PRAYER = Ημέρα Μετανοίας και Προσευχής +holiday.description.REPUBLIC_DAY = Ημέρα Δημοκρατίας +holiday.description.RESPECT_AGED_DAY = Ημέρα σεβασμού για τους ηλικιωμένους +holiday.description.REST_INDEP = Ημέρα Αποκατάστασης της Ανεξαρτησίας +holiday.description.REVOLUTION = Ημέρα της επανάστασης +holiday.description.RIEBEECK = Ημέρα του Van Riebeeck +holiday.description.ROMA_DAY = Ημέρα των Ρομά +holiday.description.RUPERT = Ρούπερτ της εποχής του Σάλτσμπουργκ +holiday.description.SAINT_CLEMENT = Ημέρα Αγίου Κλήμεντος της Αχρίδας +holiday.description.SAINT_PAUL_SHIPWRECK = ναυάγιο του Αγίου Παύλου holiday.description.SANTA_ANA = Fiesta de Santa Ana -holiday.description.SANTA_ROSA = Holy Rosa of Lima +holiday.description.SANTA_ROSA = Ιερή Ρόζα της Λίμα holiday.description.SANTIAGO = Fiesta de Santiago -holiday.description.SANTO_DOMINGO = Fiesta de Santo Domingo -holiday.description.SECOND_CHRISTMAS_DAY = 2nd Christmas day -holiday.description.SELF_GOVERNANCE = Self-governance Day -holiday.description.SEPARATION = Separation Day -holiday.description.SERVICE_REDUCTION = Service Reduction Day +holiday.description.SANTO_DOMINGO = Φιέστα του Αγίου Δομίνικου +holiday.description.SECOND_CHRISTMAS_DAY = 2η ημέρα Χριστουγέννων +holiday.description.SELF_GOVERNANCE = Ημέρα Αυτοδιοίκησης +holiday.description.SEPARATION = Ημέρα χωρισμού +holiday.description.SERVICE_REDUCTION = Ημέρα μείωσης υπηρεσιών holiday.description.SETTE_GIUGNO = Sette Giugno -holiday.description.SETTLER = Settlers' Day -holiday.description.SEWARD = Seward's Day +holiday.description.SETTLER = Ημέρα εποίκων +holiday.description.SEWARD = Ημέρα του Seward holiday.description.SHOWA_DAY = Showa Day holiday.description.SOLIDARITY_DAY = Ημέρα Αλληλεγγύης -holiday.description.SOMERS_DAY = Ημέρα Somers -holiday.description.SOUTHLAND_ANNIVERSARY = Southland Anniversary -holiday.description.SOVEREIGNS_BIRTHDAY = Γενέθλια του ηγεμόνα -holiday.description.SPRING_BANK_HOLIDAY = Spring Bank Holiday -holiday.description.SPRING_DAY = The Spring Day -holiday.description.STATEHOOD = Statehood day -holiday.description.STEPHENS = St.Stephen's Day +holiday.description.SOMERS_DAY = Somers Day +holiday.description.SOUTHLAND_ANNIVERSARY = Επέτειος της Νότιας χώρας +holiday.description.SOVEREIGNS_BIRTHDAY = Γενέθλια του Κυρίαρχου +holiday.description.SPRING_BANK_HOLIDAY = Εαρινή τραπεζική αργία +holiday.description.SPRING_DAY = Η ημέρα της άνοιξης +holiday.description.STATEHOOD = Ημέρα πολιτείας +holiday.description.STEPHENS = Ημέρα του Αγίου Στεφάνου holiday.description.STOUTTS_BIRTHDAY = Γενέθλια του Lavity Stoutt -holiday.description.ST_ANDREW = St. Andrew's Day -holiday.description.ST_BERCHTHOLD = St. Berchtholds day -holiday.description.ST_DEMETRIUS = St.Demetrius' Day -holiday.description.ST_ELIJAH = St.Elijah's Day -holiday.description.ST_GEORGE = St.George Day -holiday.description.ST_JAMES = St. James Day -holiday.description.ST_JOHN = St. John's Day -holiday.description.ST_JOSEPH = St. Josephs day -holiday.description.ST_MARTIN = St. Martin's Day -holiday.description.ST_NICHOLAS = St. Nicholas Day -holiday.description.ST_PATRICK = Saint Patrick's Day -holiday.description.ST_PETER = St.Peter's Day -holiday.description.ST_PETER_PAUL = St. Peter and Paul day -holiday.description.ST_SEBASTIAN = Saint Sebastian -holiday.description.ST_URSULA = Ημέρα του Αγίου Ursulas -holiday.description.ST_VITUS = St.Vitus' Day -holiday.description.SUMMER_BANK_HOLIDAY = Summer Bank Holiday -holiday.description.TARANAKI_ANNIVERSARY = Taranaki Anniversary -holiday.description.TERRITORY_DAY = Ημέρα επικράτειας -holiday.description.THANKSGIVING = Thanksgiving Day -holiday.description.THEOPHANY = Theophany -holiday.description.THREE_HIERARCHS = The Three Holy Hierarchs -holiday.description.TIRADENTES = Tiradentes' Day +holiday.description.ST_ANDREW = Ημέρα του Αγίου Ανδρέα +holiday.description.ST_BERCHTHOLD = Ημέρα του St. Berchtholds +holiday.description.ST_DEMETRIUS = Ημέρα του Αγίου Δημητρίου +holiday.description.ST_ELIJAH = Ημέρα του Αγίου Ηλία +holiday.description.ST_GEORGE = Ημέρα του Αγίου Γεωργίου +holiday.description.ST_JAMES = Ημέρα του Αγίου Ιακώβου +holiday.description.ST_JOHN = Ημέρα του Αγίου Ιωάννη +holiday.description.ST_JOSEPH = Ημέρα του Αγίου Ιωσήφ +holiday.description.ST_MARTIN = Ημέρα του Αγίου Μαρτίνου +holiday.description.ST_NICHOLAS = Ημέρα του Αγίου Νικολάου +holiday.description.ST_PATRICK = Ημέρα του Αγίου Πατρικίου +holiday.description.ST_PETER = Ημέρα του Αγίου Πέτρου +holiday.description.ST_PETER_PAUL = Ημέρα των Αγίων Πέτρου και Παύλου +holiday.description.ST_SEBASTIAN = Άγιος Σεβαστιανός +holiday.description.ST_URSULA = Ημέρα της Αγίας Ούρσουλας +holiday.description.ST_VITUS = Ημέρα του Αγίου Βίτου +holiday.description.SUMMER_BANK_HOLIDAY = Καλοκαιρινές διακοπές +holiday.description.TARANAKI_ANNIVERSARY = Επέτειος Ταρανάκη +holiday.description.TERRITORY_DAY = Ημέρα Περιοχής +holiday.description.THAIPOOSAM_CAVEDEE = Thaipoosam Cavadee +holiday.description.THANKSGIVING = Ημέρα των Ευχαριστιών +holiday.description.THEOPHANY = Θεοφάνεια +holiday.description.THREE_HIERARCHS = Οι Τρεις Άγιοι Ιεράρχες +holiday.description.TIRADENTES = Ημέρα Tiradentes holiday.description.TOURIST_TROPHY = Tourist Trophy Senior Race Day -holiday.description.TRUMAN = Truman Day -holiday.description.TURKEY_CHILDRENS_DAY = National Sovereignty and Children's Day -holiday.description.TURKEY_COMMEMORATION_OF_ATATURK = Commemoration of Atatürk, Youth and Sports Day -holiday.description.TURKEY_DEMOCRATIC_UNITY_DAY = Democracy and National Unity Day -holiday.description.TURKEY_REPUBLIC_DAY = Republic Day -holiday.description.TURKEY_VICTORY_DAY = Victory Day -holiday.description.TYNWALD = Tynwald Day -holiday.description.UNIFICATION = Unification Day -holiday.description.UNIFICATION_GERMANY = German Unity Day -holiday.description.VETERANS_DAY = Veterans Day -holiday.description.VICTORIA_DAY = Queen Victorias Birthday -holiday.description.VICTORY = Victory Day -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.TRUMAN = Ημέρα Τρούμαν +holiday.description.TURKEY_CHILDRENS_DAY = Εθνική Κυριαρχία και Ημέρα του Παιδιού +holiday.description.TURKEY_COMMEMORATION_OF_ATATURK = Εορτασμός του Ατατούρκ, Ημέρα Νεολαίας και Αθλητισμού +holiday.description.TURKEY_DEMOCRATIC_UNITY_DAY = Ημέρα Δημοκρατίας και Εθνικής Ενότητας +holiday.description.TURKEY_REPUBLIC_DAY = Ημέρα Δημοκρατίας +holiday.description.TURKEY_VICTORY_DAY = Ημέρα της Νίκης +holiday.description.TYNWALD = Ημέρα Tynwald +holiday.description.UGAADI = Ugaadi +holiday.description.UNIFICATION = Ημέρα Ενοποίησης +holiday.description.UNIFICATION_GERMANY = Ημέρα Γερμανικής Ενότητας +holiday.description.VETERANS_DAY = Ημέρα Βετεράνων +holiday.description.VICTORIA_DAY = Γενέθλια της Βασίλισσας Βικτώριας +holiday.description.VICTORY = Ημέρα της Νίκης +holiday.description.VICTORY_ADWA = Νίκη την ημέρα Adwa +holiday.description.VICTORY_DAY = Οι πόλεμοι τελειώνουν στην Ευρώπη +holiday.description.VIRGIN_CARMEN = Ημέρα της Παρθένου Κάρμεν holiday.description.VIRGIN_ISLANDS_DAY = Ημέρα των Παρθένων Νήσων -holiday.description.VIRGIN_MARY = Virgin Mary Day -holiday.description.WAITANGI_DAY = Waitangi Day -holiday.description.WASHINGTONS_BIRTHDAY = Washington's Birthday -holiday.description.WELLINGTON_ANNIVERSARY = Wellington Anniversary -holiday.description.WENCELAS = St. Wenceslas Day -holiday.description.WESTERN_AUSTRALIA = Western Australia Day -holiday.description.WESTLAND_ANNIVERSARY = Westland Anniversary -holiday.description.WEST_VIRGINIA = West Virginia Day -holiday.description.YOUTH = Youth Day -holiday.description.christian.ASCENSION_DAY = Ascension Day -holiday.description.christian.ASH_WEDNESDAY = Ash Wednesday -holiday.description.christian.CARNIVAL = Carnival -holiday.description.christian.CLEAN_MONDAY = Clean Monday +holiday.description.VIRGIN_MARY = Ημέρα της Παναγίας +holiday.description.WAITANGI_DAY = Ημέρα Waitangi +holiday.description.WASHINGTONS_BIRTHDAY = Γενέθλια της Ουάσιγκτον +holiday.description.WELLINGTON_ANNIVERSARY = Επέτειος του Ουέλινγκτον +holiday.description.WENCELAS = Ημέρα του Αγίου Βέντσελα +holiday.description.WESTERN_AUSTRALIA = Ημέρα Δυτικής Αυστραλίας +holiday.description.WESTLAND_ANNIVERSARY = Επέτειος Westland +holiday.description.WEST_VIRGINIA = Ημέρα Δυτικής Βιρτζίνια +holiday.description.YOUTH = Ημέρα Νεολαίας +holiday.description.christian.ASCENSION_DAY = Ημέρα της Ανάληψης +holiday.description.christian.ASH_WEDNESDAY = Τετάρτη τέφρας +holiday.description.christian.CARNIVAL = Καρναβάλι +holiday.description.christian.CLEAN_MONDAY = Καθαρά Δευτέρα holiday.description.christian.CORPUS_CHRISTI = Corpus Christi -holiday.description.christian.EASTER = Easter -holiday.description.christian.EASTER_MONDAY = Easter Monday -holiday.description.christian.EASTER_SATURDAY = Easter Saturday -holiday.description.christian.EASTER_TUESDAY = Easter Tuesday -holiday.description.christian.GENERAL_PRAYER_DAY = General prayer day -holiday.description.christian.GOOD_FRIDAY = Good Friday +holiday.description.christian.EASTER = Πάσχα +holiday.description.christian.EASTER_MONDAY = Δευτέρα του Πάσχα +holiday.description.christian.EASTER_SATURDAY = Σάββατο του Πάσχα +holiday.description.christian.EASTER_TUESDAY = Τρίτη του Πάσχα +holiday.description.christian.GENERAL_PRAYER_DAY = Ημέρα γενικής προσευχής +holiday.description.christian.GOOD_FRIDAY = Μεγάλη Παρασκευή holiday.description.christian.MARDI_GRAS = Mardi Gras -holiday.description.christian.MAUNDY_THURSDAY = Maundy Thursday -holiday.description.christian.PENTECOST = Pentecost -holiday.description.christian.PENTECOST_MONDAY = Pentecost Monday -holiday.description.christian.SACRED_HEART = Sacred Heart -holiday.description.christian.SHROVE_MONDAY = Shrove Monday -holiday.description.christian.WHIT_MONDAY = Whit Monday -holiday.description.christian.WHIT_SUNDAY = Whit Sunday -holiday.description.ethiopian.orthodox.ENKUTATASH = Enkutatash +holiday.description.christian.MAUNDY_THURSDAY = Μεγάλη Πέμπτη +holiday.description.christian.PENTECOST = Πεντηκοστή +holiday.description.christian.PENTECOST_MONDAY = Δευτέρα της Πεντηκοστής +holiday.description.christian.SACRED_HEART = Ιερή Καρδιά +holiday.description.christian.SHROVE_MONDAY = Καθαρή Δευτέρα +holiday.description.christian.WHIT_MONDAY = Καθαρή Δευτέρα +holiday.description.christian.WHIT_SUNDAY = Κυριακή +holiday.description.ethiopian.orthodox.ENKUTATASH = Ενκουτατάς holiday.description.ethiopian.orthodox.MESKEL = Meskel holiday.description.ethiopian.orthodox.TIMKAT = Timkat -holiday.description.islamic.ARAFAAT = Arafaat -holiday.description.islamic.ASCHURA = Ashura +holiday.description.islamic.ARAFAAT = Αραφάατ +holiday.description.islamic.ASCHURA = Ασούρα holiday.description.islamic.ID_AL_FITR = Eid ul-Fitr -holiday.description.islamic.ID_AL_FITR_2 = Eid ul-Fitr day 2 -holiday.description.islamic.ID_AL_FITR_3 = Eid ul-Fitr day 3 +holiday.description.islamic.ID_AL_FITR_2 = Eid ul-Fitr ημέρα 2 +holiday.description.islamic.ID_AL_FITR_3 = Eid ul-Fitr ημέρα 3 holiday.description.islamic.ID_UL_ADHA = Eid ul-Adha -holiday.description.islamic.ID_UL_ADHA_2 = Eid ul-Adha day 2 -holiday.description.islamic.ID_UL_ADHA_3 = Eid ul-Adha day 3 +holiday.description.islamic.ID_UL_ADHA_2 = Eid ul-Adha ημέρα 2 +holiday.description.islamic.ID_UL_ADHA_3 = Eid ul-Adha ημέρα 3 holiday.description.islamic.LAILAT_AL_BARAT = Lailat al-Baraat holiday.description.islamic.LAILAT_AL_MIRAJ = Lailat al Miraj holiday.description.islamic.LAILAT_AL_QADR = Laylat al-Qadr holiday.description.islamic.MAWLID_AN_NABI = Mawlid an-Nabi -holiday.description.islamic.NEWYEAR = Islamic New Year -holiday.description.islamic.RAMADAN = Ramadan -holiday.description.islamic.RAMADAN_END = Ramadan End +holiday.description.islamic.NEWYEAR = Ισλαμική Πρωτοχρονιά +holiday.description.islamic.RAMADAN = Ραμαζάνι +holiday.description.islamic.RAMADAN_END = Τέλος του Ραμαζανιού diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/UtilTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/UtilTest.java index a14ba754a..db892fc00 100644 --- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/UtilTest.java +++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/UtilTest.java @@ -106,6 +106,6 @@ void testUmlaut() { assertThat(hs) .isNotNull() .hasSize(1); - assertThat(hs.iterator().next().getDescription(Locale.GERMANY)).isEqualTo("Heilige Drei K\u00F6nige"); + assertThat(hs.iterator().next().getDescription(Locale.GERMANY)).isEqualTo("Heilige Drei Könige"); } }