Skip to content

Commit

Permalink
Merge pull request #578 from focus-shift/518-bulgaria-moving-conditions
Browse files Browse the repository at this point in the history 
bulgaria: add moving conditions..
  • Loading branch information
@derTobsch
derTobsch committed Jul 12, 2024
2 parents 57c8ac0 + 666b851 commit 68b5635
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 20 deletions.
51 changes: 41 additions & 10 deletions jollyday-core/src/main/resources/holidays/Holidays_bg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,47 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
<Holidays>
<Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
<Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION"/>
<Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
<Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE"/>
<Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE"/>
<Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION"/>
<Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
<Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
<Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
<Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
<Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="NATIONAL_DAY">
<MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE">
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="WEDNESDAY"/>
</Fixed>
<Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="TUESDAY"/>
</Fixed>
<Fixed month="DECEMBER" day="26" descriptionPropertiesKey="SECOND_CHRISTMAS_DAY">
<MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
</Fixed>
<ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" chronology="JULIAN"/>
<ChristianHoliday type="EASTER_SATURDAY" descriptionPropertiesKey="christian.EASTER_SATURDAY" chronology="JULIAN"/>
<ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER" chronology="JULIAN"/>
Expand Down
23 changes: 13 additions & 10 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_bg_2010.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
<Holidays>
<Fixed month="JANUARY" day="1"/>
<Fixed month="MARCH" day="3"/>
<Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
<Fixed month="MAY" day="6"/>
<Fixed month="MAY" day="24"/>
<Fixed month="SEPTEMBER" day="6"/>
<Fixed month="SEPTEMBER" day="22"/>
<Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
<Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION"/>
<Fixed month="APRIL" day="2" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
<Fixed month="APRIL" day="3" descriptionPropertiesKey="christian.EASTER_SATURDAY"/>
<Fixed month="APRIL" day="4" descriptionPropertiesKey="christian.EASTER"/>
<Fixed month="APRIL" day="5" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
<Fixed month="MAY" day="3" descriptionPropertiesKey="LABOUR_DAY"/>
<Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE"/>
<Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE"/>
<Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION"/>
<Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
<Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="NATIONAL_DAY"/>
<Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
<Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
<Fixed month="DECEMBER" day="31"/>
<Fixed month="APRIL" day="2"/>
<Fixed month="APRIL" day="5"/>
<Fixed month="DECEMBER" day="27" descriptionPropertiesKey="SECOND_CHRISTMAS_DAY"/>
</Holidays>
</Configuration>

0 comments on commit 68b5635

Please sign in to comment.