Merge branch 'main' into avant-drag

2025-09-25 05:54:25 -04:00 · 2024-05-11 16:03:31 +02:00 · 2024-05-11 16:03:31 +02:00 · 06fd1f44fb
commit 06fd1f44fb
parent 8d40b346ba 9ce8b63338
1 changed files with 330 additions and 30 deletions
--- a/locale/en/calendar/events.js
+++ b/locale/en/calendar/events.js
@ -15,13 +15,73 @@ export default [
    // --- static date ---
    new Event('Harvey Milk Day', null, 5, day(22), EventLevel.Day),
    new Event('{/terminology#pink%20triangle=Pink Triangle} Day (Canada)', null, 2, day(14), EventLevel.Day, ['pink triangle']),
-    new Event('Marriage Equality Day (US)', '_hrc', 6, day(26), EventLevel.Day),
-    new Event('Marriage Equality Day (England and Wales)', '_hrc', 3, day(13), EventLevel.Day),
-    new Event('Marriage Equality Day (Scotland)', '_hrc', 12, day(16), EventLevel.Day),
-    new Event('Marriage Equality Day (Northern Ireland)', '_hrc', 1, day(13), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (US)',
+        '_hrc',
+        6,
+        day(26),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2015,
+    ),
+    new Event(
+        'Marriage Equality Day (England and Wales)',
+        '_hrc',
+        3,
+        day(13),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2014,
+    ),
+    new Event(
+        'Marriage Equality Day (Scotland)',
+        '_hrc',
+        12,
+        day(16),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2014,
+    ),
+    new Event(
+        'Marriage Equality Day (Northern Ireland)',
+        '_hrc',
+        1,
+        day(13),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2020,
+    ),
    new Event('Marriage Equality Day (Canada)', '_hrc', 7, day(20), EventLevel.Day),
-    new Event('Marriage Equality Day (Australia)', '_hrc', 12, day(9), EventLevel.Day),
-    new Event('Marriage Equality Day (New Zealand)', '_hrc', 8, day(19), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (Australia)',
+        '_hrc',
+        12,
+        day(9),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2017,
+    ),
+    new Event(
+        'Marriage Equality Day (New Zealand)',
+        '_hrc',
+        8,
+        day(19),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2013,
+    ),
    new Event('Marriage Referendum Anniversary (Ireland)', '_hrc', 5, day(22), EventLevel.Day),
    new Event('Freedom to Marry Day (US)', '_hrc', 2, day(12), EventLevel.Day),
    new Event('Anniversary of the Decriminalisation of Homosexuality in England and Wales (1967)', '_law', 7, day(27), EventLevel.Day),
@ -64,29 +124,239 @@ export default [
    new Event('{https://en.wikipedia.org/wiki/Marielle_Franco=Marielle Franco} Day of Remembrance (Brazil)', '_black-ribbon', 3, day(14), EventLevel.Day),
    new Event('{https://tdor.translivesmatter.info/reports/2019/05/06/milo-mazurkiewicz_warsaw-masovia-poland_9a028d4a=Milo Mazurkiewicz} Day of Remembrance (Poland)', '_black-ribbon', 5, day(6), EventLevel.Day, ['transgender', 'nonbinary']),
    new Event('Anniversary of Operation Hyacinth (Poland)', null, 11, day(15), EventLevel.Day, ['homophobia']),
-    new Event('Marriage Equality Day (Germany)', '_hrc', 10, day(1), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (Germany)',
+        '_hrc',
+        10,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2010,
+    ),
    new Event('Marriage Equality Day (Austria/Luxembourg/Norway)', '_hrc', 1, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (Belgium)', '_hrc', 6, day(1), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (Belgium)',
+        '_hrc',
+        6,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2003,
+    ),
    new Event('Marriage Equality Day (Faroe Islands/Switzerland)', '_hrc', 7, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (Spain)', '_hrc', 7, day(3), EventLevel.Day),
-    new Event('Marriage Equality Day (Argentina)', '_hrc', 7, day(15), EventLevel.Day),
-    new Event('Marriage Equality Day (Uruguay)', '_hrc', 8, day(5), EventLevel.Day),
-    new Event('Marriage Equality Day (Colombia)', '_hrc', 4, day(28), EventLevel.Day),
-    new Event('Marriage Equality Day (Ecuador)', '_hrc', 7, day(8), EventLevel.Day),
-    new Event('Marriage Equality Day (Costa Rica)', '_hrc', 5, day(26), EventLevel.Day),
-    new Event('Marriage Equality Day (Portugal)', '_hrc', 6, day(5), EventLevel.Day),
-    new Event('Marriage Equality Day (Brazil)', '_hrc', 5, day(16), EventLevel.Day),
-    new Event('Marriage Equality Day (Netherlands)', '_hrc', 4, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (France)', '_hrc', 5, day(18), EventLevel.Day),
-    new Event('Marriage Equality Day (Sweden)', '_hrc', 5, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (Finland)', '_hrc', 3, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (South Africa)', '_hrc', 11, day(30), EventLevel.Day),
-    new Event('Marriage Equality Day (Iceland)', '_hrc', 6, day(27), EventLevel.Day),
-    new Event('Marriage Equality Day (Denmark)', '_hrc', 6, day(15), EventLevel.Day),
-    new Event('Marriage Equality Day (Greenland)', '_hrc', 4, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (Malta)', '_hrc', 9, day(1), EventLevel.Day),
-    new Event('Marriage Equality Day (Taiwan)', '_hrc', 5, day(24), EventLevel.Day),
-    new Event('Marriage Equality Day (Chile)', '_hrc', 3, day(10), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (Spain)',
+        '_hrc',
+        7,
+        day(3),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2005,
+    ),
+    new Event(
+        'Marriage Equality Day (Argentina)',
+        '_hrc',
+        7,
+        day(22),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2010,
+    ),
+    new Event(
+        'Marriage Equality Day (Uruguay)',
+        '_hrc',
+        8,
+        day(5),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2013,
+    ),
+    new Event(
+        'Marriage Equality Day (Colombia)',
+        '_hrc',
+        4,
+        day(28),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2016,
+    ),
+    new Event(
+        'Marriage Equality Day (Ecuador)',
+        '_hrc',
+        7,
+        day(8),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2019,
+    ),
+    new Event(
+        'Marriage Equality Day (Costa Rica)',
+        '_hrc',
+        5,
+        day(26),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2020,
+    ),
+    new Event(
+        'Marriage Equality Day (Portugal)',
+        '_hrc',
+        6,
+        day(5),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2010,
+    ),
+    new Event(
+        'Marriage Equality Day (Brazil)',
+        '_hrc',
+        5,
+        day(16),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2013,
+    ),
+    new Event(
+        'Marriage Equality Day (Netherlands)',
+        '_hrc',
+        4,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2001,
+    ),
+    new Event(
+        'Marriage Equality Day (France)',
+        '_hrc',
+        5,
+        day(18),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2013,
+    ),
+    new Event(
+        'Marriage Equality Day (Sweden)',
+        '_hrc',
+        5,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2009,
+    ),
+    new Event(
+        'Marriage Equality Day (Finland)',
+        '_hrc',
+        3,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2017,
+    ),
+    new Event(
+        'Marriage Equality Day (South Africa)',
+        '_hrc',
+        11,
+        day(30),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2006,
+    ),
+    new Event(
+        'Marriage Equality Day (Iceland)',
+        '_hrc',
+        6,
+        day(27),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2010,
+    ),
+    new Event(
+        'Marriage Equality Day (Denmark)',
+        '_hrc',
+        6,
+        day(15),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2012,
+    ),
+    new Event(
+        'Marriage Equality Day (Greenland)',
+        '_hrc',
+        4,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2016,
+    ),
+    new Event(
+        'Marriage Equality Day (Malta)',
+        '_hrc',
+        9,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2017,
+    ),
+    new Event(
+        'Marriage Equality Day (Taiwan)',
+        '_hrc',
+        5,
+        day(24),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2019,
+    ),
+    new Event(
+        'Marriage Equality Day (Chile)',
+        '_hrc',
+        3,
+        day(10),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2022,
+    ),
    new Event('{https://www.hiv.gov/blog/caribbean-american-hivaids-awareness-day-hiv-in-the-caribbean-region=Caribbean-American HIV/AIDS Awareness Day} (US)', '_red-ribbon', 6, day(8), EventLevel.Day, ['aids']),
    new Event('{/terminology#lesbian=Lesbian} {https://www.bng.gal/articulo/novas/dia-visibilidade-lesbica-galega/20210608103130030074.html=Visibility Day} (Galicia)', 'Lesbian', 6, day(8), EventLevel.Day, ['lesbian']),
    new Event('{https://napwha.org.au/about-us/national-network-of-women/=National Day of Women living with HIV} (Australia)', '_red-ribbon', 3, day(9), EventLevel.Day, ['aids']),
@ -94,10 +364,40 @@ export default [
    new Event('{https://en.wikipedia.org/wiki/2022_Oslo_shooting=2022 Oslo Pride Shooting} Remembrance Day', '_black-ribbon', 6, day(25), EventLevel.Day),
    new Event('{https://en.wikipedia.org/wiki/2022_Bratislava_shooting=2022 Bratislava Shooting} Remembrance Day', '_black-ribbon', 10, day(12), EventLevel.Day),
    new Event('{/terminology#two%20spirit=Two-Spirit} and Indigenous LGBTQQIA+ Awareness to Celebration Day (Canada)', 'Two Spirit_', 3, day(21), EventLevel.Day, ['two spirit']),
-    new Event('Marriage Equality Day (Slovenia)', '_hrc', 7, day(8), EventLevel.Day),
-    new Event('Marriage Equality Day (Andorra)', '_hrc', 2, day(17), EventLevel.Day),
+    new Event(
+        'Marriage Equality Day (Slovenia)',
+        '_hrc',
+        7,
+        day(8),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2022,
+    ),
+    new Event(
+        'Marriage Equality Day (Andorra)',
+        '_hrc',
+        2,
+        day(17),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2023,
+    ),
    new Event('Butch Appreciation Day', '_Butch', 8, day(18), EventLevel.Day),
-    new Event('Marriage Equality Day (Estonia)', '_hrc', 6, day(20), EventLevel.Day, [], null, null, (y) => y >= 2023),
+    new Event(
+        'Marriage Equality Day (Estonia)',
+        '_hrc',
+        1,
+        day(1),
+        EventLevel.Day,
+        [],
+        null,
+        null,
+        (year) => year >= 2024,
+    ),
    new Event('Dissociative Identity Disorder Awareness Day', '_plurality', 3, day(5), EventLevel.Day),
    new Event('{https://worldngoday.org/=World NGO Day}', '_law', 2, day(27), EventLevel.Day),