From 2a85402bb4190121da6c42196423e842d4dc5fa3 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Fri, 20 May 2022 19:59:29 +0200 Subject: [PATCH 1/5] [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 2/5] [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 3/5] 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 4/5] [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 5/5] [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