From 2a85402bb4190121da6c42196423e842d4dc5fa3 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Fri, 20 May 2022 19:59:29 +0200 Subject: [PATCH 01/11] [pl][inclusive] --- locale/pl/translations.suml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml index 16e484648..fbe856bdb 100644 --- a/locale/pl/translations.suml +++ b/locale/pl/translations.suml @@ -335,7 +335,7 @@ inclusive: categories: 'Kategorie' sources: 'Linki źródłowe' clarification: 'Załącz wyjaśnienie' - clarificationDefault: 'Chodzi oczywiście o użycie w tym pejoratywnym znaczeniu. Nie mówimy, żeby zupełnie nie używać tego słowa.' + clarificationDefault: 'Chodzi oczywiście o użycie w tym pejoratywnym znaczeniu. Nie mówimy, żeby zupełnie nie używać tego określenia.' terminology: header: 'Terminologia' From 7eb543b291f861b3f79e5aa7b0d79feb44fdc6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= Date: Sat, 21 May 2022 09:22:41 +0000 Subject: [PATCH 02/11] [en] Update events.js --- locale/en/calendar/events.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locale/en/calendar/events.js b/locale/en/calendar/events.js index 56200104e..a2e73f057 100644 --- a/locale/en/calendar/events.js +++ b/locale/en/calendar/events.js @@ -64,6 +64,9 @@ module.exports = [ new Event('{https://twitter.com/MspecLesbianss=Mspec Lesbian Visbility & Awareness Week}', '_mspec_lesbians', 5, weekStarting(22), EventLevel.Week, ['mspec lesbian', 'bi lesbian']), new Event('UpStairs Lounge Arson Attack Remembrance Day', '_black-ribbon', 6, day(24), EventLevel.Day), new Event('Admiral Duncan Pub Bombing Remembrance Day', '_black-ribbon', 4, day(30), EventLevel.Day), + new Event('Anniversary of the {https://en.wikipedia.org/wiki/Dance_of_the_Forty-One=Dance of the Forty-One} (Mexico)', null, 11, day(18), EventLevel.Day), + 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']), // --- dynamic date --- From d180dd384b253a44fbfe4b604c42bdea1f3a8c5a Mon Sep 17 00:00:00 2001 From: Tymoteusz Lisowski Date: Sun, 22 May 2022 09:44:15 +0000 Subject: [PATCH 03/11] Update locale/pl/nouns/dukatywy.tsv --- locale/pl/nouns/dukatywy.tsv | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/pl/nouns/dukatywy.tsv b/locale/pl/nouns/dukatywy.tsv index 360864faa..6fa1fe5ad 100644 --- a/locale/pl/nouns/dukatywy.tsv +++ b/locale/pl/nouns/dukatywy.tsv @@ -67,3 +67,4 @@ czy cza czu czy/czowie cze czy cy ca cu cy ce cy z zka zu zowie zki zy pan pani panu panowie panie pany +ster stra stru strzy stry stry From c44f431b84fe38d56f161cb13f13bdb4fabdafa1 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Mon, 23 May 2022 18:48:00 +0200 Subject: [PATCH 04/11] [inclusive] fix clarification edit --- components/InclusiveSubmitForm.vue | 4 +++- locale/pl/translations.suml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/InclusiveSubmitForm.vue b/components/InclusiveSubmitForm.vue index e2d85d454..f098703eb 100644 --- a/components/InclusiveSubmitForm.vue +++ b/components/InclusiveSubmitForm.vue @@ -149,7 +149,9 @@ watch: { clarification(v) { if (v) { - this.form.clarification = this.$t('inclusive.clarificationDefault'); + if (!this.form.clarification) { + this.form.clarification = this.$t('inclusive.clarificationDefault'); + } } else { this.form.clarification = null; } diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml index fbe856bdb..44cdb890e 100644 --- a/locale/pl/translations.suml +++ b/locale/pl/translations.suml @@ -8,7 +8,7 @@ home: headerLong: 'Lista zaimków' welcome: 'Witamy na stronie zaimki.pl!' intro: > - Tworzymy tu wszechstronne kompendium wiedzy o języku niebinarnym i neutralnym płciowo. + Tworzymy tu wszechstronne kompendium wiedzy o języku niebinarnym, neutralnym płciowo i inkluzywnym. why: 'Skąd potrzeba niebinarnych zaimków?' about: - > From 4020b0bfbf84e550eacc2f36ab87ede2b27b3358 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Mon, 23 May 2022 19:03:19 +0200 Subject: [PATCH 05/11] [pl][nouns] fix dukatywy "magister" --- locale/pl/nouns/dukatywy.tsv | 2 +- locale/pl/nouns/iksatywy.tsv | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/locale/pl/nouns/dukatywy.tsv b/locale/pl/nouns/dukatywy.tsv index 6fa1fe5ad..48fc20d9c 100644 --- a/locale/pl/nouns/dukatywy.tsv +++ b/locale/pl/nouns/dukatywy.tsv @@ -67,4 +67,4 @@ czy cza czu czy/czowie cze czy cy ca cu cy ce cy z zka zu zowie zki zy pan pani panu panowie panie pany -ster stra stru strzy stry stry +ster stra stru strzy stry stry diff --git a/locale/pl/nouns/iksatywy.tsv b/locale/pl/nouns/iksatywy.tsv index cfe01bce7..904e4de03 100644 --- a/locale/pl/nouns/iksatywy.tsv +++ b/locale/pl/nouns/iksatywy.tsv @@ -66,3 +66,5 @@ wy wa wx wi we wxx czy cza czx czy/czowie cze czxx cy ca cx cy ce cxx z zka zx zowie zki zxx +pan pani panx panowie panie panxx +ster stra strx strzy stry strxx From a5df8f6e37446077707999f0f8f33401822a4300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= Date: Tue, 24 May 2022 00:22:37 +0000 Subject: [PATCH 06/11] [es] Update events.js --- locale/es/calendar/events.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/es/calendar/events.js b/locale/es/calendar/events.js index 2ce069dfb..8d5ca73bd 100644 --- a/locale/es/calendar/events.js +++ b/locale/es/calendar/events.js @@ -48,6 +48,8 @@ module.exports = [ new Event('Día del Orgullo de Ser Travesti y Transexual (Brasil)', 'Transgender', 5, day(15), EventLevel.Day, ['transgender', 'travesti']), new Event('Día Nacional de Afirmación Gay (Brasil)', 'LGBTQ', 2, day(28), EventLevel.Day, ['lgbtq', 'gay', 'homosexual']), new Event('Día de la Inclusión Social (Brasil)', null, 12, day(10), EventLevel.Day), + new Event('Día de la Visibilidad de las Lesbianas del Espectro Multisexual', '_mspec_lesbians', 5, day(26), EventLevel.Day, ['mspec lesbian', 'bi lesbian']), + new Event('Semana de la Visibilidad de las Lesbianas del Espectro Multisexual', '_mspec_lesbians', 5, weekStarting(22), EventLevel.Week, ['mspec lesbian', 'bi lesbian']), // --- one-off events --- new Event('{https://www.facebook.com/marchadelorgulloar/=Marcha del Orgullo Buenos Aires} (Argentina)', 'LGBTQ', 11, dayYear(6, 2021), EventLevel.Day), From 255a7617d4bc2655c9e426f33217b28a6be10cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= Date: Tue, 24 May 2022 22:30:57 +0000 Subject: [PATCH 07/11] [en] Update events.js --- locale/en/calendar/events.js | 1 - 1 file changed, 1 deletion(-) diff --git a/locale/en/calendar/events.js b/locale/en/calendar/events.js index a2e73f057..70c9c962f 100644 --- a/locale/en/calendar/events.js +++ b/locale/en/calendar/events.js @@ -58,7 +58,6 @@ module.exports = [ new Event('Suicide Prevention Day (Uruguay)', '_yellow-ribbon', 7, day(17), EventLevel.Day), new Event('Suicide Prevention Day (Puerto Rico)', '_yellow-ribbon', 8, day(12), EventLevel.Day), 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, ['mspec lesbian', 'bi lesbian']), new Event('{https://twitter.com/MspecLesbianss=Mspec Lesbian Visbility & Awareness Week}', '_mspec_lesbians', 5, weekStarting(22), EventLevel.Week, ['mspec lesbian', 'bi lesbian']), From 840b18877c1377c329ff13aecd8d6f768eb71d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= Date: Tue, 24 May 2022 22:33:59 +0000 Subject: [PATCH 08/11] [de] Update events.js --- locale/de/calendar/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de/calendar/events.js b/locale/de/calendar/events.js index 5ceca2a54..f338d1a15 100644 --- a/locale/de/calendar/events.js +++ b/locale/de/calendar/events.js @@ -2,7 +2,7 @@ const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/cal module.exports = [ // --- months --- - new Event('{https://queerhistory.de=Queer History Month} (Monat der queeren Geschichte)', 'Progress Pride', 5, month, EventLevel.Month), + new Event('{https://queerhistory.de=Queer History Month} (Monat der queeren Geschichte) in Deutschland und Kuba', 'Progress Pride', 5, month, EventLevel.Month), new Event('Jahrestag der Ehe für alle in Deutschland', '_hrc', 10, day(1), EventLevel.Day), new Event('Jahrestag der Ehe für alle in Österreich', '_hrc', 1, day(1), EventLevel.Day), new Event('Jahrestag der Ehe für alle in Belgien', '_hrc', 6, day(1), EventLevel.Day), From f03bd91210bfdc3ef7a044b226821075da984636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= Date: Tue, 24 May 2022 22:38:51 +0000 Subject: [PATCH 09/11] [en] Update events.js --- locale/en/calendar/events.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/locale/en/calendar/events.js b/locale/en/calendar/events.js index 70c9c962f..2b70be0cb 100644 --- a/locale/en/calendar/events.js +++ b/locale/en/calendar/events.js @@ -66,6 +66,23 @@ module.exports = [ new Event('Anniversary of the {https://en.wikipedia.org/wiki/Dance_of_the_Forty-One=Dance of the Forty-One} (Mexico)', null, 11, day(18), EventLevel.Day), 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('Marriage Equality Day (Germany)', '_hrc', 10, day(1), EventLevel.Day), + new Event('Marriage Equality Day (Austria)', '_hrc', 1, day(1), EventLevel.Day), + new Event('Marriage Equality Day (Belgium)', '_hrc', 6, day(1), EventLevel.Day), + new Event('Marriage Equality Day (Luxembourg)', '_hrc', 1, day(1), EventLevel.Day), + new Event('Marriage Equality Day (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 (Brasil)', '_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), // --- dynamic date --- From 14a255812a43a2ed3fb6ea97c58480e32f218b11 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Wed, 25 May 2022 19:03:56 +0200 Subject: [PATCH 10/11] [user][ban] ensure no init emails get sent out to banned users --- server/routes/user.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/routes/user.js b/server/routes/user.js index ba1eb9ad8..8b6eb380f 100644 --- a/server/routes/user.js +++ b/server/routes/user.js @@ -314,6 +314,10 @@ router.post('/user/init', handleErrorAsync(async (req, res) => { return res.json({ error: 'user.account.changeEmail.invalid' }) } + if (await lookupBanArchive(req.db, 'email', payload)) { + throw 'banned'; + } + let codeKey; if (isTest) { codeKey = await saveAuthenticator(req.db, 'email', user, payload, 15); From 9d8c15cfbe50e1a69dd02b49de66764c58e9aba1 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Thu, 26 May 2022 18:45:38 +0200 Subject: [PATCH 11/11] print layout improvements --- assets/print.scss | 8 ++++++++ components/ScrollButton.vue | 2 +- components/Submenu.vue | 2 +- routes/blogEntry.vue | 16 ++++++++++------ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/assets/print.scss b/assets/print.scss index 5748577ac..4f53c24e6 100644 --- a/assets/print.scss +++ b/assets/print.scss @@ -8,4 +8,12 @@ background: none; background-color: $white; } + hr { + display: block; + border: 2px solid $border-color; + } + + @page { + margin: 1cm; + } } diff --git a/components/ScrollButton.vue b/components/ScrollButton.vue index bb00ed624..a97d5a3fc 100644 --- a/components/ScrollButton.vue +++ b/components/ScrollButton.vue @@ -1,5 +1,5 @@