From 535fe06c7ea2ffc29f1692bb7151e58e3eb475c9 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Wed, 27 Apr 2022 22:57:05 +0200 Subject: [PATCH] [calendar] fix dates of lesbian visibility week --- locale/_/calendar/events.js | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/locale/_/calendar/events.js b/locale/_/calendar/events.js index b5a0c5257..28a155aaf 100644 --- a/locale/_/calendar/events.js +++ b/locale/_/calendar/events.js @@ -199,15 +199,29 @@ module.exports = [ }), EventLevel.Week), new Event('lesbian_visibility_week', 'Lesbian', 4, week(function* (monthDays) { - let lastDay = null; + let buffer = []; + const ret = []; for (let d of monthDays) { if (d.day >= 26) { - yield d; + for (let dd of buffer) { + ret.push(dd); + } + buffer = []; + ret.push(d); + continue; } - lastDay = d; + + if (d.dayOfWeek === 1) { + buffer = []; + } + buffer.push(d); } - yield new Day(lastDay.year, 5, 1); - yield new Day(lastDay.year, 5, 2); + + let i = 1; + while (ret.length < 7) { + ret.push(new Day(ret[0].year, 5, i++)) + } + yield* ret; }), EventLevel.Week, ['lesbian']), // first Sunday of May