Skip to content
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

Jump to bottom

Update China holidays: add observed and substituted holidays in 2001-2024 #1613

Merged
merged 5 commits into from
Jan 2, 2024
Merged

Update China holidays: add observed and substituted holidays in 2001-2024 #1613

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da0cf2b
Update China holidays: add observed and substituted holidays in 2001-…
KJhellico Dec 7, 2023
159c168
PR suggestion
KJhellico Dec 30, 2023
f64d30a
Merge branch 'beta' into upd-china
KJhellico Jan 1, 2024
65d8e10
Bump version in .po files
KJhellico Jan 1, 2024
2bd561c
PR suggestion
KJhellico Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
430 changes: 244 additions & 186 deletions holidays/countries/china.py
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 0 additions & 20 deletions holidays/groups/chinese.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,26 +146,6 @@ def _add_chinese_new_years_day_five(self, name) -> Optional[date]:
name, self._chinese_calendar.lunar_new_year_date(self._year), days_delta=+4
)

def _add_chinese_new_years_day_six(self, name) -> Optional[date]:
"""
Add Chinese New Year's Day Six.

https://en.wikipedia.org/wiki/Chinese_New_Year
"""
return self._add_chinese_calendar_holiday(
name, self._chinese_calendar.lunar_new_year_date(self._year), days_delta=+5
)

def _add_chinese_new_years_day_seven(self, name) -> Optional[date]:
"""
Add Chinese New Year's Day Seven.

https://en.wikipedia.org/wiki/Chinese_New_Year
"""
return self._add_chinese_calendar_holiday(
name, self._chinese_calendar.lunar_new_year_date(self._year), days_delta=+6
)

def _add_qingming_festival(self, name) -> date:
"""
Add Qingming Festival (15th day after the Spring Equinox).
Expand Down
34 changes: 30 additions & 4 deletions holidays/locale/en_US/LC_MESSAGES/CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python Holidays 0.35\n"
"Project-Id-Version: Python Holidays 0.41\n"
"POT-Creation-Date: 2023-09-28 19:23+0700\n"
"PO-Revision-Date: 2023-09-28 19:49+0700\n"
"Last-Translator: PPsyrius <ppsyrius@ppsyrius.dev>\n"
"PO-Revision-Date: 2023-12-29 19:02+0200\n"
"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
"Language-Team: Python Holidays localization team\n"
"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Generated-By: Lingua 4.15.0\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#. %s (Observed).
#, c-format
msgid "%s（观察日）"
msgstr "%s (Observed)"

#. New Year's Day.
msgid "元旦"
Expand All @@ -32,6 +37,10 @@ msgstr "Mid-Autumn Festival"
msgid "春节"
msgstr "Chinese New Year (Spring Festival)"

#. Chinese New Year's Eve.
msgid "农历除夕"
msgstr "Chinese New Year's Eve"

#. Labor Day.
msgid "劳动节"
msgstr "Labor Day"
Expand Down Expand Up @@ -59,3 +68,20 @@ msgstr "Children's Day"
#. Army Day.
msgid "建军节"
msgstr "Army Day"

#. Date format (see strftime() Format Codes).
msgid "%Y-%m-%d"
msgstr "%m/%d/%Y"

#. Day off (substituted from %s).
#, c-format
msgid "休息日（%s日起取代）"
msgstr "Day off (substituted from %s)"

#. 70th Anniversary of the Victory of the Chinese People’s War of Resistance
#. against Japanese
#. Aggression and the World Anti-Fascist War.
msgid "中国人民抗日战争暨世界反法西斯战争胜利70周年纪念日"
msgstr ""
"70th Anniversary of the Victory of the Chinese People’s War of Resistance "
"against Japanese Aggression and the World Anti-Fascist War"
32 changes: 28 additions & 4 deletions holidays/locale/th/LC_MESSAGES/CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python Holidays 0.35\n"
"Project-Id-Version: Python Holidays 0.41\n"
"POT-Creation-Date: 2023-09-28 19:23+0700\n"
"PO-Revision-Date: 2023-09-28 19:57+0700\n"
"Last-Translator: PPsyrius <ppsyrius@ppsyrius.dev>\n"
"PO-Revision-Date: 2023-12-30 17:46+0200\n"
"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
"Language-Team: Python Holidays localization team\n"
"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Lingua 4.15.0\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#. %s (Observed).
#, c-format
msgid "%s（观察日）"
msgstr "ชดเชย%s"

#. New Year's Day.
msgid "元旦"
Expand All @@ -32,6 +37,10 @@ msgstr "วันไหว้พระจันทร์"
msgid "春节"
msgstr "วันตรุษจีน"

#. Chinese New Year's Eve.
msgid "农历除夕"
msgstr "วันก่อนวันตรุษจีน"

#. Labor Day.
msgid "劳动节"
msgstr "วันแรงงาน"
Expand Down Expand Up @@ -59,3 +68,18 @@ msgstr "วันเด็กสากล"
#. Army Day.
msgid "建军节"
msgstr "วันสถาปนากองทัพปลดปล่อยประชาชนจีน"

#. Date format (see strftime() Format Codes).
msgid "%Y-%m-%d"
msgstr "%d/%m/%Y"

#. Day off (substituted from %s).
#, c-format
msgid "休息日（%s日起取代）"
msgstr "วันหยุด (แทน %s)"

#. 70th Anniversary of the Victory of the Chinese People’s War of Resistance
#. against Japanese
#. Aggression and the World Anti-Fascist War.
msgid "中国人民抗日战争暨世界反法西斯战争胜利70周年纪念日"
msgstr "ครบรอบ 70 ปีแห่งการได้รับชัยชนะจากสงครามต่อต้านญี่ปุ่นและลัทธิฟาสซิสต์โลก"
32 changes: 28 additions & 4 deletions holidays/locale/zh_CN/LC_MESSAGES/CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python Holidays 0.35\n"
"Project-Id-Version: Python Holidays 0.41\n"
"POT-Creation-Date: 2023-09-28 19:23+0700\n"
"PO-Revision-Date: 2023-09-28 19:42+0700\n"
"Last-Translator: PPsyrius <ppsyrius@ppsyrius.dev>\n"
"PO-Revision-Date: 2023-12-29 19:03+0200\n"
"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
"Language-Team: Python Holidays localization team\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Lingua 4.15.0\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#. %s (Observed).
#, c-format
msgid "%s（观察日）"
msgstr ""

#. New Year's Day.
msgid "元旦"
Expand All @@ -32,6 +37,10 @@ msgstr ""
msgid "春节"
msgstr ""

#. Chinese New Year's Eve.
msgid "农历除夕"
msgstr ""

#. Labor Day.
msgid "劳动节"
msgstr ""
Expand Down Expand Up @@ -59,3 +68,18 @@ msgstr ""
#. Army Day.
msgid "建军节"
msgstr ""

#. Date format (see strftime() Format Codes).
msgid "%Y-%m-%d"
msgstr ""

#. Day off (substituted from %s).
#, c-format
msgid "休息日（%s日起取代）"
msgstr ""

#. 70th Anniversary of the Victory of the Chinese People’s War of Resistance
#. against Japanese
#. Aggression and the World Anti-Fascist War.
msgid "中国人民抗日战争暨世界反法西斯战争胜利70周年纪念日"
msgstr ""
32 changes: 28 additions & 4 deletions holidays/locale/zh_TW/LC_MESSAGES/CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Python Holidays 0.35\n"
"Project-Id-Version: Python Holidays 0.41\n"
"POT-Creation-Date: 2023-09-28 19:23+0700\n"
"PO-Revision-Date: 2023-09-28 19:43+0700\n"
"Last-Translator: PPsyrius <ppsyrius@ppsyrius.dev>\n"
"PO-Revision-Date: 2023-12-29 19:04+0200\n"
"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
"Language-Team: Python Holidays localization team\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Lingua 4.15.0\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#. %s (Observed).
#, c-format
msgid "%s（观察日）"
msgstr "%s（觀察日）"

#. New Year's Day.
msgid "元旦"
Expand All @@ -32,6 +37,10 @@ msgstr "中秋節"
msgid "春节"
msgstr "春節"

#. Chinese New Year's Eve.
msgid "农历除夕"
msgstr "農曆除夕"

#. Labor Day.
msgid "劳动节"
msgstr "勞動節"
Expand Down Expand Up @@ -59,3 +68,18 @@ msgstr "六一兒童節"
#. Army Day.
msgid "建军节"
msgstr "建軍節"

#. Date format (see strftime() Format Codes).
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"

#. Day off (substituted from %s).
#, c-format
msgid "休息日（%s日起取代）"
msgstr "休息日（%s日起取代）"

#. 70th Anniversary of the Victory of the Chinese People’s War of Resistance
#. against Japanese
#. Aggression and the World Anti-Fascist War.
msgid "中国人民抗日战争暨世界反法西斯战争胜利70周年纪念日"
msgstr "中國人民抗日戰爭暨世界反法西斯戰爭勝利70週年紀念日"