Skip to content

Commit 5502896

Browse files
Merge branch 'master' of ssh://github.com/holidays/definitions into fix_2021_jp_holiday_20201221
2 parents d86ed8c + 5400c8a commit 5502896

File tree

5 files changed

+179
-5
lines changed

5 files changed

+179
-5
lines changed

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Holiday definitions
22

3+
## 5.3.0
4+
5+
Update many defitnions.
6+
7+
Definitions changes:
8+
9+
* Change name of Foundation Day in Western Australia to 'Western Austra…(Thanks to https://github.com/mattman)
10+
* add Kazakh holidays(Thanks to https://github.com/Legomegger)
11+
* Add AFL Grand final dates for 2018-2020(Thanks to https://github.com/anicholson)
12+
* Add 2021 jp holiday(Thanks to https://github.com/ryosukeYamazaki)
13+
14+
315
## 5.2.0
416

517
Update many defitnions.

au.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Australian holiday definitions for the Ruby Holiday gem.
2-
# Updated: 2019-02-10
2+
# Updated: 2020-07-15
33
# Sources:
44
# - http://en.wikipedia.org/wiki/Australian_public_holidays
55
# - http://www.docep.wa.gov.au/lr/LabourRelations/Content/Wages%20and%20Conditions/Public%20Holidays/Public_Holidays.html
@@ -90,7 +90,7 @@ months:
9090
regions: [au_sa]
9191
function: may_pub_hol_sa(year)
9292
6:
93-
- name: Foundation Day
93+
- name: Western Australia Day
9494
regions: [au_wa]
9595
week: 1
9696
wday: 1
@@ -186,6 +186,12 @@ methods:
186186
Date.civil(2016, 9, 30)
187187
when 2017
188188
Date.civil(2017, 9, 29)
189+
when 2018
190+
Date.civil(2018, 9, 28)
191+
when 2019
192+
Date.civil(2019,9, 27)
193+
when 2020
194+
Date.civil(2020, 10, 23)
189195
end
190196
qld_queens_bday_october:
191197
# http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates

index.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ defs:
3434
IS: ['is.yaml']
3535
IT: ['it.yaml']
3636
KR: ['kr.yaml']
37+
KZ: ['kz.yaml']
3738
LI: ['li.yaml']
3839
LT: ['lt.yaml']
3940
LV: ['lv.yaml']

jp.yaml

+30-3
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,29 @@ months:
129129
mday: 23
130130
year_ranges:
131131
limited: [2020]
132+
- name: 海の日
133+
regions: [jp]
134+
mday: 22
135+
year_ranges:
136+
limited: [2021]
132137
- name: 海の日
133138
regions: [jp]
134139
wday: 1
135140
week: 3
136141
year_ranges:
137-
from: 2021
142+
from: 2022
138143
- name: 振替休日
139144
regions: [jp]
140145
function: jp_marine_day_substitute(year)
141146
year_ranges:
142147
between:
143148
start: 1996
144149
end: 2002
150+
- name: スポーツの日
151+
regions: [jp]
152+
mday: 23
153+
year_ranges:
154+
limited: [2021]
145155
- name: スポーツの日
146156
regions: [jp]
147157
mday: 24
@@ -160,15 +170,32 @@ months:
160170
mday: 10
161171
year_ranges:
162172
limited: [2020]
173+
- name: 山の日
174+
regions: [jp]
175+
mday: 8
176+
year_ranges:
177+
limited: [2021]
163178
- name: 山の日
164179
regions: [jp]
165180
year_ranges:
166-
from: 2021
181+
from: 2022
167182
function: jp_mountain_holiday(year)
168183
- name: 振替休日
169184
regions: [jp]
170185
year_ranges:
171-
from: 2016
186+
between:
187+
start: 2016
188+
end: 2020
189+
function: jp_mountain_holiday_substitute(year)
190+
- name: 振替休日
191+
regions: [jp]
192+
mday: 9
193+
year_ranges:
194+
limited: [2021]
195+
- name: 振替休日
196+
regions: [jp]
197+
year_ranges:
198+
from: 2022
172199
function: jp_mountain_holiday_substitute(year)
173200
9:
174201
- name: 敬老の日

kz.yaml

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Kazakh holiday definitions for the Ruby Holiday gem.
2+
#
3+
# Created: 2020-09-18
4+
# Sources:
5+
# - https://www.officeholidays.com/countries/kazakhstan/2020
6+
# - https://en.wikipedia.org/wiki/Public_holidays_in_Kazakhstan
7+
---
8+
months:
9+
1:
10+
- name: Jańa jyl # New Year's Day
11+
regions: [kz]
12+
mday: 1
13+
- name: Jańa jyl # 1st New Year holiday
14+
regions: [kz]
15+
mday: 2
16+
3:
17+
- name: Halyqaralyq áıelder kúni # International Women's Day
18+
regions: [kz]
19+
mday: 8
20+
- name: Naýryz Meıramy # Nauryz
21+
regions: [kz]
22+
mday: 21
23+
- name: Naýryz Meıramy # Nauryz
24+
regions: [kz]
25+
mday: 22
26+
- name: Naýryz Meıramy # Nauryz
27+
regions: [kz]
28+
mday: 23
29+
5:
30+
- name: Qazaqstan halqynyń birligi merekesi # Kazakhstan People's Unity Day
31+
regions: [kz]
32+
mday: 1
33+
- name: Otan Qorǵaýshy kuni # Defender of the Fatherland day
34+
regions: [kz]
35+
mday: 7
36+
- name: Jeńis kúni # Victory Day
37+
regions: [kz]
38+
mday: 9
39+
7:
40+
- name: Astana kúni # Capital Day
41+
regions: [kz]
42+
mday: 6
43+
8:
44+
- name: Qazaqstan Respýblıkasynyń Konstıtýcıyasy kúni # Constitution day
45+
regions: [kz]
46+
mday: 30
47+
12:
48+
- name: Túńǵysh Prezıdent kúni # First President Day
49+
regions: [kz]
50+
mday: 1
51+
- name: Táýelsizdik kúni # Independence day
52+
regions: [kz]
53+
mday: 16
54+
- name: Táýelsizdik kúni # Independence day
55+
regions: [kz]
56+
mday: 17
57+
58+
tests:
59+
- given:
60+
date: ['2020-1-1']
61+
regions: ["kz"]
62+
expect:
63+
name: "Jańa jyl"
64+
- given:
65+
date: ['2020-1-2']
66+
regions: ["kz"]
67+
expect:
68+
name: "Jańa jyl"
69+
- given:
70+
date: '2020-3-8'
71+
regions: ["kz"]
72+
expect:
73+
name: "Halyqaralyq áıelder kúni"
74+
- given:
75+
date: '2020-3-21'
76+
regions: ["kz"]
77+
expect:
78+
name: "Naýryz Meıramy"
79+
- given:
80+
date: '2020-3-22'
81+
regions: ["kz"]
82+
expect:
83+
name: "Naýryz Meıramy"
84+
- given:
85+
date: '2020-3-23'
86+
regions: ["kz"]
87+
expect:
88+
name: "Naýryz Meıramy"
89+
- given:
90+
date: '2020-5-1'
91+
regions: ["kz"]
92+
expect:
93+
name: "Qazaqstan halqynyń birligi merekesi"
94+
- given:
95+
date: '2020-5-7'
96+
regions: ["kz"]
97+
expect:
98+
name: "Otan Qorǵaýshy kuni"
99+
- given:
100+
date: '2020-5-9'
101+
regions: ["kz"]
102+
expect:
103+
name: "Jeńis kúni"
104+
- given:
105+
date: '2020-7-6'
106+
regions: ["kz"]
107+
expect:
108+
name: "Astana kúni"
109+
- given:
110+
date: '2020-8-30'
111+
regions: ["kz"]
112+
expect:
113+
name: "Qazaqstan Respýblıkasynyń Konstıtýcıyasy kúni"
114+
- given:
115+
date: '2020-12-1'
116+
regions: ["kz"]
117+
expect:
118+
name: "Túńǵysh Prezıdent kúni"
119+
- given:
120+
date: '2020-12-16'
121+
regions: ["kz"]
122+
expect:
123+
name: "Táýelsizdik kúni"
124+
- given:
125+
date: '2020-12-17'
126+
regions: ["kz"]
127+
expect:
128+
name: "Táýelsizdik kúni"

0 commit comments

Comments
 (0)