Skip to content

fix(AL): correct Albanian holiday substitutes #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KristjanESPERANTO wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(AL): correct Albanian holiday substitutes #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions data/countries/AL.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
holidays:
# @source https://www.bankofalbania.org/Shtypi/Kalendari_i_festave_zyrtare_2026/
# @attrib https://en.wikipedia.org/wiki/Public_holidays_in_Albania
AL:
names:
Expand All @@ -11,10 +12,10 @@ holidays:
zones:
- Europe/Tirane
days:
01-01 and if sunday then next tuesday:
01-01 and if saturday then next monday if sunday then next tuesday:
_name: 01-01
substitute: true
01-02 and if sunday then next monday:
01-02 and if saturday then next monday if sunday then next tuesday:
name:
sq: Festa e Vitit të Ri
en: New Year Holiday
Expand All @@ -32,12 +33,12 @@ holidays:
03-08:
_name: Mothers Day
type: observance
03-14 and if sunday then next monday:
03-14 and if saturday,sunday then next monday:
name:
sq: Dita e Verës
en: Summer Day
substitute: true
03-22 and if sunday then next monday:
03-22 and if saturday,sunday then next monday:
name:
sq: Dita e Sulltan Nevruzit
en: Sultan Nevruz's Day
Expand All @@ -61,15 +62,15 @@ holidays:
name:
sq: Pashkët Ortodokse
en: Orthodox Easter
05-01 and if sunday then next monday:
05-01 and if saturday,sunday then next monday:
_name: 05-01
substitute: true
06-01:
name:
sq: Dita Ndërkombëtare e Fëmijëve
en: Children's Day
type: observance
10-19 and if sunday then next monday:
10-19 and if saturday,sunday then next monday:
name:
sq: Dita e Nënë Terezës
en: Mother Teresa Day
Expand All @@ -81,13 +82,13 @@ holidays:
sq: Dita e Alfabetit
en: Alphabet Day
type: observance
11-28 and if sunday then next monday:
11-28 and if saturday,sunday then next monday:
_name: Independence Day
substitute: true
11-29 and if sunday then next monday:
11-29 and if saturday,sunday then next monday:
_name: Liberation Day
substitute: true
12-08 and if sunday then next monday:
12-08 and if saturday,sunday then next monday:
name:
sq: Dita Kombëtare e Rinisë
en: Youth Day
Expand All @@ -97,7 +98,7 @@ holidays:
12-24:
_name: 12-24
type: bank
12-25 and if sunday then next monday:
12-25 and if saturday,sunday then next monday:
_name: 12-25
substitute: true
1 Shawwal:
Expand Down
44 changes: 32 additions & 12 deletions test/fixtures/AL-2015.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"end": "2015-01-01T23:00:00.000Z",
"name": "Viti i Ri",
"type": "public",
"rule": "01-01 and if sunday then next tuesday",
"rule": "01-01 and if saturday then next monday if sunday then next tuesday",
"_weekday": "Thu"
},
{
Expand All @@ -14,7 +14,7 @@
"end": "2015-01-02T23:00:00.000Z",
"name": "Festa e Vitit të Ri",
"type": "public",
"rule": "01-02 and if sunday then next monday",
"rule": "01-02 and if saturday then next monday if sunday then next tuesday",
"_weekday": "Fri"
},
{
Expand Down Expand Up @@ -50,16 +50,26 @@
"end": "2015-03-14T23:00:00.000Z",
"name": "Dita e Verës",
"type": "public",
"rule": "03-14 and if sunday then next monday",
"rule": "03-14 and if saturday,sunday then next monday",
"_weekday": "Sat"
},
{
"date": "2015-03-16 00:00:00",
"start": "2015-03-15T23:00:00.000Z",
"end": "2015-03-16T23:00:00.000Z",
"name": "Dita e Verës (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "03-14 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
"date": "2015-03-22 00:00:00",
"start": "2015-03-21T23:00:00.000Z",
"end": "2015-03-22T23:00:00.000Z",
"name": "Dita e Sulltan Nevruzit",
"type": "public",
"rule": "03-22 and if sunday then next monday",
"rule": "03-22 and if saturday,sunday then next monday",
"_weekday": "Sun"
},
{
Expand All @@ -69,7 +79,7 @@
"name": "Dita e Sulltan Nevruzit (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "03-22 and if sunday then next monday",
"rule": "03-22 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand Down Expand Up @@ -123,7 +133,7 @@
"end": "2015-05-01T22:00:00.000Z",
"name": "Dita Ndërkombëtare e Punonjësve",
"type": "public",
"rule": "05-01 and if sunday then next monday",
"rule": "05-01 and if saturday,sunday then next monday",
"_weekday": "Fri"
},
{
Expand Down Expand Up @@ -159,7 +169,7 @@
"end": "2015-10-19T22:00:00.000Z",
"name": "Dita e Nënë Terezës",
"type": "public",
"rule": "10-19 and if sunday then next monday",
"rule": "10-19 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand All @@ -177,7 +187,7 @@
"end": "2015-11-28T23:00:00.000Z",
"name": "Dita e Pavarësisë",
"type": "public",
"rule": "11-28 and if sunday then next monday",
"rule": "11-28 and if saturday,sunday then next monday",
"_weekday": "Sat"
},
{
Expand All @@ -186,7 +196,7 @@
"end": "2015-11-29T23:00:00.000Z",
"name": "Dita e Çlirimit",
"type": "public",
"rule": "11-29 and if sunday then next monday",
"rule": "11-29 and if saturday,sunday then next monday",
"_weekday": "Sun"
},
{
Expand All @@ -196,7 +206,17 @@
"name": "Dita e Çlirimit (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "11-29 and if sunday then next monday",
"rule": "11-29 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
"date": "2015-11-30 00:00:00",
"start": "2015-11-29T23:00:00.000Z",
"end": "2015-11-30T23:00:00.000Z",
"name": "Dita e Pavarësisë (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "11-28 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand All @@ -205,7 +225,7 @@
"end": "2015-12-08T23:00:00.000Z",
"name": "Dita Kombëtare e Rinisë",
"type": "public",
"rule": "12-08 and if sunday then next monday",
"rule": "12-08 and if saturday,sunday then next monday",
"_weekday": "Tue"
},
{
Expand All @@ -223,7 +243,7 @@
"end": "2015-12-25T23:00:00.000Z",
"name": "Krishtlindja",
"type": "public",
"rule": "12-25 and if sunday then next monday",
"rule": "12-25 and if saturday,sunday then next monday",
"_weekday": "Fri"
}
]
34 changes: 22 additions & 12 deletions test/fixtures/AL-2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"end": "2016-01-01T23:00:00.000Z",
"name": "Viti i Ri",
"type": "public",
"rule": "01-01 and if sunday then next tuesday",
"rule": "01-01 and if saturday then next monday if sunday then next tuesday",
"_weekday": "Fri"
},
{
Expand All @@ -14,9 +14,19 @@
"end": "2016-01-02T23:00:00.000Z",
"name": "Festa e Vitit të Ri",
"type": "public",
"rule": "01-02 and if sunday then next monday",
"rule": "01-02 and if saturday then next monday if sunday then next tuesday",
"_weekday": "Sat"
},
{
"date": "2016-01-04 00:00:00",
"start": "2016-01-03T23:00:00.000Z",
"end": "2016-01-04T23:00:00.000Z",
"name": "Festa e Vitit të Ri (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "01-02 and if saturday then next monday if sunday then next tuesday",
"_weekday": "Mon"
},
{
"date": "2016-03-02 00:00:00",
"start": "2016-03-01T23:00:00.000Z",
Expand Down Expand Up @@ -50,7 +60,7 @@
"end": "2016-03-14T23:00:00.000Z",
"name": "Dita e Verës",
"type": "public",
"rule": "03-14 and if sunday then next monday",
"rule": "03-14 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand All @@ -59,7 +69,7 @@
"end": "2016-03-22T23:00:00.000Z",
"name": "Dita e Sulltan Nevruzit",
"type": "public",
"rule": "03-22 and if sunday then next monday",
"rule": "03-22 and if saturday,sunday then next monday",
"_weekday": "Tue"
},
{
Expand Down Expand Up @@ -95,7 +105,7 @@
"end": "2016-05-01T22:00:00.000Z",
"name": "Dita Ndërkombëtare e Punonjësve",
"type": "public",
"rule": "05-01 and if sunday then next monday",
"rule": "05-01 and if saturday,sunday then next monday",
"_weekday": "Sun"
},
{
Expand All @@ -114,7 +124,7 @@
"name": "Dita Ndërkombëtare e Punonjësve (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "05-01 and if sunday then next monday",
"rule": "05-01 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand Down Expand Up @@ -159,7 +169,7 @@
"end": "2016-10-19T22:00:00.000Z",
"name": "Dita e Nënë Terezës",
"type": "public",
"rule": "10-19 and if sunday then next monday",
"rule": "10-19 and if saturday,sunday then next monday",
"_weekday": "Wed"
},
{
Expand All @@ -177,7 +187,7 @@
"end": "2016-11-28T23:00:00.000Z",
"name": "Dita e Pavarësisë",
"type": "public",
"rule": "11-28 and if sunday then next monday",
"rule": "11-28 and if saturday,sunday then next monday",
"_weekday": "Mon"
},
{
Expand All @@ -186,7 +196,7 @@
"end": "2016-11-29T23:00:00.000Z",
"name": "Dita e Çlirimit",
"type": "public",
"rule": "11-29 and if sunday then next monday",
"rule": "11-29 and if saturday,sunday then next monday",
"_weekday": "Tue"
},
{
Expand All @@ -195,7 +205,7 @@
"end": "2016-12-08T23:00:00.000Z",
"name": "Dita Kombëtare e Rinisë",
"type": "public",
"rule": "12-08 and if sunday then next monday",
"rule": "12-08 and if saturday,sunday then next monday",
"_weekday": "Thu"
},
{
Expand All @@ -213,7 +223,7 @@
"end": "2016-12-25T23:00:00.000Z",
"name": "Krishtlindja",
"type": "public",
"rule": "12-25 and if sunday then next monday",
"rule": "12-25 and if saturday,sunday then next monday",
"_weekday": "Sun"
},
{
Expand All @@ -223,7 +233,7 @@
"name": "Krishtlindja (ditë zëvendësuese)",
"type": "public",
"substitute": true,
"rule": "12-25 and if sunday then next monday",
"rule": "12-25 and if saturday,sunday then next monday",
"_weekday": "Mon"
}
]
Loading