Merge branch 'main' into mecenaty

2022-05-26 11:46:00 +02:00 · 2022-05-26 11:46:00 +02:00 · 07cce3b499
parent e95efbbddf 4b6129d17b
commit 07cce3b499
12 changed files with 55 additions and 13 deletions
--- 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;
+    }
 }
--- 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;
                }
--- a/components/ScrollButton.vue
+++ b/components/ScrollButton.vue
@ -1,5 +1,5 @@
 <template>
-    <div class="scroll-btn" @click.prevent="scroll" :style="`opacity: ${shown ? 1 : 0}`">
+    <div class="scroll-btn d-print-none" @click.prevent="scroll" :style="`opacity: ${shown ? 1 : 0}`">
        <SquareButton link="#" :colour="colour" :aria-label="$t('table.scrollUp')">
            <Icon v="arrow-alt-up"/>
        </SquareButton>
--- a/components/Submenu.vue
+++ b/components/Submenu.vue
@ -1,5 +1,5 @@
 <template>
-    <section class="mt-4 mt-lg-0">
+    <section class="mt-4 mt-lg-0 d-print-none">
        <div class="d-none d-md-inline-flex btn-group btn-block mb-2 w-100">
            <router-link v-for="{name, icon, iconInverse, route, routesExtra, condition} in links" :key="name"
                         v-if="condition === undefined || condition === true"
--- 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),
--- a/locale/en/calendar/events.js
+++ b/locale/en/calendar/events.js
@ -58,12 +58,31 @@ 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']),
    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']),
+    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 ---

--- 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),
--- 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
--- 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
--- 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:
        - >
@ -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'
--- a/routes/blogEntry.vue
+++ b/routes/blogEntry.vue
@ -14,12 +14,13 @@
            <Spelling :text="content"/>
        </Twemoji>

-        <Separator icon="heart"/>
-        <Support/>
-
-        <section>
-            <Share :title="title"/>
-        </section>
+        <div class="d-print-none">
+            <Separator icon="heart"/>
+            <Support/>
+            <section>
+                <Share :title="title"/>
+            </section>
+        </div>
    </div>
 </template>

@ -50,6 +51,9 @@
    @import "assets/variables";

    .blog-post {
+        hyphens: auto;
+        text-align: justify;
+
        img {
            max-width: 100%;
        }
--- 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);