-
Notifications
You must be signed in to change notification settings - Fork 446
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.
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
postponed days for Russian holidays in 2024 #1760
Conversation
29.04.2024 30.04.2024 10.05.2024 30.12.2024 31.12.2024 according to: https://www.consultant.ru/document/cons_doc_LAW_455140/
29.04.2024 30.04.2024 10.05.2024 30.12.2024 31.12.2024 according to: https://www.consultant.ru/document/cons_doc_LAW_455140/
29.04.2024 30.04.2024 10.05.2024 30.12.2024 31.12.2024 according to: https://www.consultant.ru/document/cons_doc_LAW_455140/
Pull Request Test Coverage Report for Build 8664950383Details
💛 - Coveralls |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@summicron502 Thank you for your contribution, although you might want to consider switching to the dedicated substituted holidays pattern instead, as shown in #1613 . 👍
That and some additional test cases for these postponed holidays would make this PR perfect for merging.
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Changes accepted |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@summicron502 Other changes (I've put them as subcomments so they may have been overlooked before):
holidays/countries/russia.py
Line 115-137 (class RussiaStaticHolidays
section)
class RussiaStaticHolidays:
# Date format (see strftime() Format Codes).
substituted_date_format = tr("%d.%m.%Y")
# Postpone of %s.
substituted_label = tr("Перенос %s")
special_public_holidays = {
# Postponed Days 2023
# src: https://www.consultant.ru/document/cons_doc_LAW_425407/
2023: (
(FEB, 24, JAN, 1),
(MAY, 8, JAN, 8),
),
# Postponed Days 2024
# src: https://www.consultant.ru/document/cons_doc_LAW_455140/
2024: (
(APR, 29, APR, 27),
(APR, 30, FEB, 11),
(MAY, 10, JUN, 1),
(DEC, 30, DEC, 28),
(DEC, 31, JAN, 7),
),
}
tests/countries/test_russia.py
Line 30-40 (def test_special_holidays(self)
section)
def test_special_holidays(self):
self.assertHoliday(
# Postponed Holidays.
"2023-02-24",
"2023-05-08",
"2024-04-29",
"2024-04-30",
"2024-05-10",
"2024-12-30",
"2024-12-31",
)
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
It's just a friendly reminder to address the CI/CD issues before we could merge this PR. Thank you! |
Co-authored-by: Panpakorn Siripanich <19505219+PPsyrius@users.noreply.github.com>
|
Please include these parts manually since GitHub doesn't allow code reviewers to suggest sections that the original PR contributor doesn't touch. (These are already tested with |
For some reason l10n started to fail
Is it known problem or that's my fault? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please find my comments to address below:
@@ -8,6 +8,7 @@ Akos Furton | |||
Alejandro Antunes | |||
Alexander Schulze | |||
Alexandre Carvalho | |||
Andrei Klimenko |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the alphabetical order, please
.coverage 2
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be removed.
#. Postpone of %s. | ||
#, c-format | ||
msgid "Перенос %s" | ||
msgstr "Postpone of %s" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We normally use Выходной (перенесено с %s)
Day off (substituted from %s)
for the labels
try running |
@summicron502 did you have a chance to work on addressing the issues/comments? |
Proposed change
Added postponed days for Russian holidays in 2024
Added days and translations
Type of change
Checklist
make pre-commit
, it didn't generate any changesmake test
, all tests passed locally