From c9d8632cfd0984952f6f177e3bd4905c834ad810 Mon Sep 17 00:00:00 2001 From: Avris Date: Sat, 11 Dec 2021 11:00:35 +0100 Subject: [PATCH] [nl][pl][pt][ru] calendar improvements --- locale/nl/events.js | 23 +++++++++++++++++++++++ locale/pl/events.js | 2 +- locale/pt/events.js | 4 ++-- locale/ru/events.js | 4 ++-- locale/ru/translations.suml | 2 +- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/locale/nl/events.js b/locale/nl/events.js index fb46b687..2c36d3dd 100644 --- a/locale/nl/events.js +++ b/locale/nl/events.js @@ -1,3 +1,26 @@ +const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../src/calendar/helpers"); + module.exports = [ + // months + new Event('LHBT-geschiedenismaand', 'Progress Pride', 2, month, EventLevel.Month), + + // static date + new Event('Marriage Equality Day (Nederland)', '_hrc', 4, day(1), EventLevel.Day), + new Event('Marriage Equality Day (België)', '_hrc', 6, day(1), EventLevel.Day), + + // dynamic date + new Event('Paarse Vrijdag (Nederland)', null, 12, function* (monthDays) { + let fridays = 0; + for (let d of monthDays) { + if (d.dayOfWeek === 5) { + fridays++; + if (fridays === 2) { + yield d; + return; + } + } + } + }, EventLevel.Day), + ]; diff --git a/locale/pl/events.js b/locale/pl/events.js index c1ad489e..6babbcba 100644 --- a/locale/pl/events.js +++ b/locale/pl/events.js @@ -6,7 +6,7 @@ module.exports = [ // static date new Event('Tęczowa Noc', null, 8, day(7), EventLevel.Day), - new Event('Rocznica Dekryminalizacji Homoseksualności w Polsce (1932)', null, 9, day(1), EventLevel.Day, ['homosexual', 'gay']), + new Event('Rocznica Dekryminalizacji Homoseksualności w Polsce (1932)', '_law', 9, day(1), EventLevel.Day, ['homosexual', 'gay']), new Event('Rocznica Rozpoczęcia Akcji „Hiacynt” (1985)', null, 11, day(15), EventLevel.Day, ['homophobia']), new Event('{https://www.facebook.com/429249150318/posts/10164869405325319=Polski Dzień Osób Niebinarnych}', 'Nonbinary', 3, day(9), EventLevel.Day, ['nonbinary']), new Event('Dzień Pamięci Milo Mazurkiewicz', '_black-ribbon', 5, day(6), EventLevel.Day, ['transgender', 'nonbinary']), diff --git a/locale/pt/events.js b/locale/pt/events.js index bcf03789..32a02d01 100644 --- a/locale/pt/events.js +++ b/locale/pt/events.js @@ -15,12 +15,12 @@ module.exports = [ new Event('Dia Nacional da Visibilidade Lésbica (Brasil)', 'Lesbian', 8, day(29), EventLevel.Day, ['lesbian']), new Event('Dia Nacional do Orgulho Lésbico (Brasil)', 'Lesbian', 8, day(19), EventLevel.Day, ['lesbian']), new Event('Aniversário da morte de Marielle Franco', '_black-ribbon', 3, day(14), EventLevel.Day), - new Event('Aniversário da Nova Lei de Identidade de Género (Portugal)', null, 4, day(14), EventLevel.Day), + new Event('Aniversário da Nova Lei de Identidade de Género (Portugal)', '_law', 4, day(14), EventLevel.Day), new Event('Dia das Rebeliões Lésbicas', 'Lesbian_', 10, day(13), EventLevel.Day, ['lesbian']), new Event('Dia Latinx da Conscientização sobre Aids/Sida (EUA)', '_red-ribbon', 10, day(15), EventLevel.Day), new Event('Dia do Orgulho de Ser Travesti e Transexual (Brasil)', 'Transgender', 5, day(15), EventLevel.Day, ['transgender', 'travesti']), new Event('Dia Nacional da Afirmação Gay (Brasil)', 'LGBTQ', 2, day(28), EventLevel.Day, ['lgbtq', 'gay', 'homosexual']), - + new Event('Dia da Inclusão Social (Brasil)', null, 12, day(10), EventLevel.Day), // one-off events new Event('{https://dezanove.pt/marcha-orgulho-lgbti-leiria-marcha-a-2-1523945=1ª Marcha do Orgulho LGBTI+ de Leiria} (Portugal)', 'LGBTQ', 10, dayYear(2, 2021), EventLevel.Day), diff --git a/locale/ru/events.js b/locale/ru/events.js index 40a5601d..268ced69 100644 --- a/locale/ru/events.js +++ b/locale/ru/events.js @@ -2,6 +2,6 @@ const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calend module.exports = [ // static date - new Event('Годовщина декриминализации гомосексуальности в России (1993)', null, 4, day(29), EventLevel.Day), - new Event('Годовщина декриминализации гомосексуальности в беларуси (1994)', null, 3, day(1), EventLevel.Day), + new Event('Годовщина декриминализации гомосексуальности в России (1993)', '_law', 4, day(29), EventLevel.Day), + new Event('Годовщина декриминализации гомосексуальности в беларуси (1994)', '_law', 3, day(1), EventLevel.Day), ]; diff --git a/locale/ru/translations.suml b/locale/ru/translations.suml index b35cabb8..09ed90f3 100644 --- a/locale/ru/translations.suml +++ b/locale/ru/translations.suml @@ -813,7 +813,7 @@ calendar: pan_week: 'Неделя пансексуальности и панромантичности' parents_day: 'День родителя без привязки к гендеру' hiv_testing_day: 'День тестирования на ВИЧ' - freedressing_day: 'Freedressing Awareness Day' # TODO + freedressing_day: 'День свободного гардероба' banner: 'Мы празднуем' celebrating_custom: 'празднуется' celebrating_day: 'празднуется'