Merge remote-tracking branch 'origin/main'

This commit is contained in:
Andrea Vos 2022-08-15 21:10:26 +02:00
commit 2a516c0dbf
2 changed files with 18 additions and 17 deletions

View File

@ -332,6 +332,24 @@ module.exports = [
}
}, EventLevel.Day),
// last full week (Monday - Friday) in January
new Event('transition_week', 'Transgender', 1, function* (monthDays) {
let lastFullWeek = [];
let currentWeek = [];
for (let d of monthDays) {
if (d.dayOfWeek === 1) {
lastFullWeek = currentWeek;
currentWeek = [];
}
if (d.dayOfWeek >= 1 && d.dayOfWeek <= 5) {
currentWeek.push(d);
}
}
yield* currentWeek.length === 5
? currentWeek
: lastFullWeek;
}, EventLevel.Week),
// --- one-off events ---
new Event('deaf_awareness_week', 'Progress Pride', 4, function* (monthDays) {
for (let d of monthDays) {

View File

@ -231,23 +231,6 @@ module.exports = [
}
}, EventLevel.Day, [], null, 'Paush 6 / पौष ६'),
// last full week (Monday - Friday) in January
new Event('{https://nationaltransitionweek.wordpress.com/=Transition Week}', 'Transgender', 1, function* (monthDays) {
let lastFullWeek = [];
let currentWeek = [];
for (let d of monthDays) {
if (d.dayOfWeek === 1) {
lastFullWeek = currentWeek;
currentWeek = [];
}
if (d.dayOfWeek >= 1 && d.dayOfWeek <= 5) {
currentWeek.push(d);
}
}
yield* currentWeek.length === 5
? currentWeek
: lastFullWeek;
}, EventLevel.Week),
// one-off events
new Event('Day of Silence', null, 4, dayYear(23, 2021), EventLevel.Day),