From b78066eb048d71f145629efeca12612e5b7ea4f2 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Sun, 10 Apr 2022 01:47:59 +0200 Subject: [PATCH] [en][calendar] mspec lesbian awareness --- locale/en/calendar/events.js | 4 +++- src/calendar/helpers.js | 14 ++++++++++++++ static/flags/_mspec_lesbians.png | Bin 0 -> 9032 bytes 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 static/flags/_mspec_lesbians.png diff --git a/locale/en/calendar/events.js b/locale/en/calendar/events.js index 17bc71806..577c5d3f8 100644 --- a/locale/en/calendar/events.js +++ b/locale/en/calendar/events.js @@ -1,4 +1,4 @@ -const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../../src/calendar/helpers"); +const {Event, day, week, month, dayYear, weekStarting, EventLevel, Day} = require("../../../src/calendar/helpers"); module.exports = [ // --- months --- @@ -65,6 +65,8 @@ module.exports = [ new Event('{https://www.instagram.com/p/CY_mGaGo9sm/=Nonbinary Grandparents\' Day} (Poland)', 'Nonbinary', 1, day(23), EventLevel.Day, ['nonbinary']), new Event('Anniversary of the death of Marielle Franco (Brazil)', '_black-ribbon', 3, day(14), EventLevel.Day), new Event('{https://standbyme.uk/nbad/=Bystander Awareness Day} (UK)', null, 3, day(13), EventLevel.Day), + new Event('{https://twitter.com/MspecLesbianss=Mspec Lesbian Visbility & Awareness Day}', '_mspec_lesbians', 5, day(26), EventLevel.Day), + new Event('{https://twitter.com/MspecLesbianss=Mspec Lesbian Visbility & Awareness Week}', '_mspec_lesbians', 5, weekStarting(22), EventLevel.Week), // --- dynamic date --- diff --git a/src/calendar/helpers.js b/src/calendar/helpers.js index d313ef375..7096a06ef 100644 --- a/src/calendar/helpers.js +++ b/src/calendar/helpers.js @@ -175,6 +175,20 @@ module.exports.week = function (generator) { return internal; } +module.exports.weekStarting = function (start) { + function *internal (monthDays) { + let count = 0; + for (let d of monthDays) { + if (d.day >= start && count < 7) { + yield d; + count++; + } + } + } + + return internal; +} + module.exports.dayYear = function (day, year) { function *internal (monthDays) { for (let d of monthDays) { diff --git a/static/flags/_mspec_lesbians.png b/static/flags/_mspec_lesbians.png new file mode 100644 index 0000000000000000000000000000000000000000..6fec11a3ab3414070666f1cdf92eedfd1b10c6c8 GIT binary patch literal 9032 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 Q{f|jk%Rn