From cac14626aab419bc6629e2109712247eb71d7f9f Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Fri, 13 Jun 2025 15:50:40 -0400
Subject: [PATCH 01/16] Make changes
---
.gitlab-ci.yml | 10 ++--------
package.json | 2 +-
pnpm-lock.yaml | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d465e38ba..fd9aab2a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,20 +38,14 @@ check:
fi
script:
- start_section "Install Dependencies"
- # temporarily replace FontAwesomePro dependency with its fake version as the CI can’t access it
- # the name needs to be changed in both package.json and pnpm-lock.yaml
- - 'sed -i "s/git+ssh:\/\/git@gitlab.com:Avris\/FontAwesomePro.git/git+https:\/\/gitlab.com\/Avris\/FakeFontAwesomePro.git/" package.json pnpm-lock.yaml'
- # the referenced SHA needs to be additionally changed in pnpm-lock.yaml
- - 'sed -i "s/git@gitlab.com+Avris\/FontAwesomePro\/f00db606f659dca78b143b7bcab5671b2cb459a8/gitlab.com\/Avris\/FakeFontAwesomePro\/0d322c775cbe9bf99da261700be30251291b51a8/" pnpm-lock.yaml'
- - 'sed -i "s/resolution: {commit: f00db606f659dca78b143b7bcab5671b2cb459a8, repo: git@gitlab.com:Avris\/FontAwesomePro.git, type: git}/resolution: { tarball: https:\/\/gitlab.com\/api\/v4\/projects\/Avris%2FFakeFontAwesomePro\/repository\/archive.tar.gz?sha=0d322c775cbe9bf99da261700be30251291b51a8 }/" pnpm-lock.yaml'
+ - echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com" > ~/.git-credentials
+ - git config set --global credential.helper store
- corepack enable pnpm
- pnpm install || record_failure
- end_section
- start_section "Setup environment"
- make install || record_failure
- # revert the changes for the FontAwesomePro dependency only now because `make install` calls `pnpm install`
- - git restore package.json pnpm-lock.yaml
- end_section
- start_section "Type checking"
diff --git a/package.json b/package.json
index d84116cef..760e6a9cb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"@aws-sdk/client-polly": "^3.525.0",
"@aws-sdk/client-s3": "^3.525.0",
"@floating-ui/vue": "^1.1.5",
- "@fortawesome/fontawesome-pro": "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git",
+ "@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FontAwesomePro",
"@sentry/browser": "^7.109.0",
"@sentry/cli": "^2.31.0",
"@sentry/node": "^7.109.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0f218089c..fbc78cd7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ importers:
specifier: ^1.1.5
version: 1.1.5(vue@3.5.16(typescript@5.8.3))
'@fortawesome/fontawesome-pro':
- specifier: git+ssh://git@gitlab.com:Avris/FontAwesomePro.git
+ specifier: https://gitlab.com/Avris/FontAwesomePro
version: git+https://git@gitlab.com:Avris/FontAwesomePro.git#f00db606f659dca78b143b7bcab5671b2cb459a8
'@sentry/browser':
specifier: ^7.109.0
From b4604e580d54bc30e718deb8f080b91790736ff2 Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Sat, 14 Jun 2025 14:28:11 -0400
Subject: [PATCH 02/16] try and fix git
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd9aab2a4..33f2e47e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ check:
script:
- start_section "Install Dependencies"
- echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com" > ~/.git-credentials
- - git config set --global credential.helper store
+ - git config --global credential.helper store
- corepack enable pnpm
- pnpm install || record_failure
- end_section
From 36d63d1e1d2212a240194d434fd56241cc5dbe0b Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Sat, 14 Jun 2025 21:39:32 -0400
Subject: [PATCH 03/16] update readme to show the changes made and reduce
un-needed steps used in the pipeline
---
.gitlab-ci.yml | 9 ++-------
README.md | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33f2e47e6..660899656 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,14 +37,10 @@ check:
apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev -y
fi
script:
- - start_section "Install Dependencies"
+ - start_section "Install Dependencies & Setup Environment"
- echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com" > ~/.git-credentials
- git config --global credential.helper store
- corepack enable pnpm
- - pnpm install || record_failure
- - end_section
-
- - start_section "Setup environment"
- make install || record_failure
- end_section
@@ -53,8 +49,7 @@ check:
- end_section
- start_section "Unit Tests"
- - >
- pnpm vitest --reporter=default --reporter=junit --outputFile=junit.xml --coverage || record_failure
+ - pnpm vitest --reporter=default --reporter=junit --outputFile=junit.xml --coverage || record_failure
- end_section
- start_section "Check linting rules"
diff --git a/README.md b/README.md
index ccde2b433..680dcf670 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ We're using FontAwesome Pro, so to set up a local copy without having a FA licen
open `package.json` and replace
```
-"@fortawesome/fontawesome-pro": "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git",
+"@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FontAwesomePro",
```
with
@@ -26,7 +26,7 @@ with
or, for Git via HTTPS:
```
-"@fortawesome/fontawesome-pro": "git+https://git@gitlab.com/Avris/FakeFontAwesomePro.git",
+"@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FakeFontAwesomePro",
```
Do not commit that change!
From 00d08ed5c373d96f2ebc8d07209aa2d1f0d15b70 Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Sun, 15 Jun 2025 11:42:56 -0400
Subject: [PATCH 04/16] enable additional checks
---
.gitlab-ci.yml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 660899656..0da328ca4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -203,7 +203,12 @@ deploy test/purple:
ENVIRONMENT_INSTANCE: 'purple'
ENVIRONMENT_DOMAIN: 'test-purple.pronouns.page'
-# include:
-# - template: Security/Dependency-Scanning.gitlab-ci.yml
+include:
+ - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+ - template: Jobs/SAST.gitlab-ci.yml
+
+variables:
+ AST_ENABLE_MR_PIPELINES: "true"
+
#
# Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136
From 9d998162329abb40bc5d975b9fe8e071968fe28d Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Sun, 15 Jun 2025 11:49:09 -0400
Subject: [PATCH 05/16] (lint)
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0da328ca4..8c7188e5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,7 +208,7 @@ include:
- template: Jobs/SAST.gitlab-ci.yml
variables:
- AST_ENABLE_MR_PIPELINES: "true"
+ AST_ENABLE_MR_PIPELINES: 'true'
#
# Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136
From 85c1f2638ebdc2a7c3916394f962fc1e760c3d4c Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Sun, 15 Jun 2025 12:12:53 -0400
Subject: [PATCH 06/16] remove SAST
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c7188e5a..758e1b4bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,10 +205,8 @@ deploy test/purple:
include:
- template: Jobs/Dependency-Scanning.gitlab-ci.yml
- - template: Jobs/SAST.gitlab-ci.yml
variables:
AST_ENABLE_MR_PIPELINES: 'true'
-#
# Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136
From ef67ea841aba2fc060a9585a103be3ca0345df2f Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Thu, 19 Jun 2025 08:37:09 +0200
Subject: [PATCH 07/16] (fix) broken language dropdown
---
components/Dropdown.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index 821b18ccd..2ee2d9651 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -16,8 +16,10 @@ onUnmounted(() => {
document.removeEventListener('click', documentClicked);
});
-const documentClicked = () => {
- shown.value = false;
+const documentClicked = (e: MouseEvent) => {
+ if (e.target && !(e.target as Element).closest('.dropdown') && shown.value) {
+ shown.value = false;
+ }
};
From f4b866f868d16918bde1d904f4e8116d944385ab Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Thu, 19 Jun 2025 18:36:27 +0200
Subject: [PATCH 08/16] (pl)(calendar) miastamaszerujace dwie kolumny
---
server/miastamaszerujace.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/miastamaszerujace.ts b/server/miastamaszerujace.ts
index 0867eab2c..93db69e13 100644
--- a/server/miastamaszerujace.ts
+++ b/server/miastamaszerujace.ts
@@ -28,7 +28,7 @@ const fetchEvents = async (): Promise => {
// manual fixes for irregular HTML
.replace(new RegExp('ref=newsfeed
', 'g'), '
')
.replace(new RegExp('(.*?)', 'g'), '$1'));
- const eventNodes = dom.window.document.querySelectorAll('[data-id="d4c3075"] p');
+ const eventNodes = dom.window.document.querySelectorAll('[data-id="d4c3075"] p, [data-id="9cc25f4"] p');
for (const p of eventNodes) {
if (p.textContent!.includes('Daty kolejnych') ||
p.textContent!.includes('Marsz organizowany przez grupę współpracującą') ||
From 0d67e18a88815f99b7b656ef1f655ec0ab719d66 Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Thu, 19 Jun 2025 18:38:29 +0200
Subject: [PATCH 09/16] (fo)(trans)
---
locale/fo/translations.suml | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/locale/fo/translations.suml b/locale/fo/translations.suml
index 5d01a5d5a..cc3ffc43c 100644
--- a/locale/fo/translations.suml
+++ b/locale/fo/translations.suml
@@ -53,13 +53,8 @@ home:
mission:
header: 'Okkara endamál'
summary: 'Vit stríða fyri frælsi, virðing og inklusjón í máli.'
- freedom: >
- Frælsi
- – so at øll sjálv kunnu gera av
- hvørji fornøvn tey føla lýsir teimum best.
- respect: >
- Virðing
- – so at fornøvnini hjá onnur eru vird.
+ freedom: 'Frælsi – so at øll sjálv kunnu gera av hvørji fornøvn tey føla lýsir tey best.'
+ respect: 'Virðing – so at fornøvnini hjá ørðum eru vird.'
inclusivity: >
Inklusjón
– so at tá vit tosa um ein annan persón vit ikki kenna,
@@ -2009,7 +2004,7 @@ calendar:
11: '%day%. novembur'
12: '%day%. desembur'
events:
- pride_month: 'Pride-mánaður'
+ pride_month: 'Heimspride-mánaður'
trans_month: 'Altjóða mánað fyri tvørkynd tilvitan'
zaimki_birthday: 'Føðingardagurin hjá Pronouns.page'
agender_day: 'Agender pride-dagur'
@@ -2039,7 +2034,7 @@ calendar:
trans_parent_day___timeDescription: 'á fyrsta sunnudag í novembur'
nonbinary_week: 'Tilvitingarvika um ikki-biner'
nonbinary_week___timeDescription: 'í vikuni (man-sun) rundan um 14’inda july'
- polyamory_day: 'Polyamory-Dagur'
+ polyamory_day: 'Fleiralskhuga-dagur'
homophobia_sport: 'Altjóðadagur ímóti homofobi í ítrótti'
gay_uncles_day: 'Dagur teirra samkyndu gubbar'
gay_uncles_day___timeDescription: 'á næsta sunnudag í august'
From 6923f8ba44d856610bcfc29c4004f8f206e1d7b2 Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Thu, 19 Jun 2025 18:01:04 -0400
Subject: [PATCH 10/16] (ci) Fix Dependency Scanning
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 758e1b4bf..acf099c9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -207,6 +207,6 @@ include:
- template: Jobs/Dependency-Scanning.gitlab-ci.yml
variables:
- AST_ENABLE_MR_PIPELINES: 'true'
-
-# Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136
+ AST_ENABLE_MR_PIPELINES: true
+ DS_EXCLUDED_ANALYZERS: gemnasium-python
+ DS_MAX_DEPTH: 4
From d7a04436bf3b881c6644b2fb3cf66272c645fa3e Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Thu, 19 Jun 2025 18:23:01 -0400
Subject: [PATCH 11/16] (ci) add more security pipelines
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acf099c9d..b6434da0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -204,9 +204,14 @@ deploy test/purple:
ENVIRONMENT_DOMAIN: 'test-purple.pronouns.page'
include:
+ - template: Jobs/Secret-Detection.gitlab-ci.yml
+ - template: Jobs/Container-Scanning.gitlab-ci.yml
- template: Jobs/Dependency-Scanning.gitlab-ci.yml
+ - template: Jobs/SAST.gitlab-ci.yml
+ - template: Jobs/SAST-IaC.gitlab-ci.yml
variables:
AST_ENABLE_MR_PIPELINES: true
DS_EXCLUDED_ANALYZERS: gemnasium-python
DS_MAX_DEPTH: 4
+ CS_QUIET: true
From 434f20d8965ec85176537180b77b84c9c25a9664 Mon Sep 17 00:00:00 2001
From: Benjamin
Date: Thu, 19 Jun 2025 18:43:47 -0400
Subject: [PATCH 12/16] (ci) Disable Container Scanning
Container Scanning requires OS image(s) to specifically be specified.
Until proper ones are able to be identified, this should remain disabled
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6434da0f..97495a46b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,7 +205,7 @@ deploy test/purple:
include:
- template: Jobs/Secret-Detection.gitlab-ci.yml
- - template: Jobs/Container-Scanning.gitlab-ci.yml
+ # - template: Jobs/Container-Scanning.gitlab-ci.yml --- TODO: Configure Images
- template: Jobs/Dependency-Scanning.gitlab-ci.yml
- template: Jobs/SAST.gitlab-ci.yml
- template: Jobs/SAST-IaC.gitlab-ci.yml
From 10a3ca10b17fc06f021c7d15db9fd863093d8be1 Mon Sep 17 00:00:00 2001
From: fo contributors
Date: Fri, 20 Jun 2025 14:19:25 +0200
Subject: [PATCH 13/16] (fo)(trans)
---
locale/fo/translations.suml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/fo/translations.suml b/locale/fo/translations.suml
index cc3ffc43c..4824e1e93 100644
--- a/locale/fo/translations.suml
+++ b/locale/fo/translations.suml
@@ -1036,7 +1036,7 @@ profile:
duplicateDescription: 'Lýsingin má vera øðrvísi enn arðar'
invalidOpinion: 'Valdað ímyndin var ikki at finna í frágreiðingini omanfyri'
kys: 'Okkara tænastutreytir banna at eggja til sjálvskaða og/ella sjálvmorð. '
- custom: 'Sergjørd, lagt afturat av:'
+ custom: 'Sergjørd, lagt afturat av brúkarinum:'
expendableList:
more: '… og %count% fleiri lutir'
show: '(trýst fyri at vísa)'
@@ -1494,7 +1494,7 @@ mode:
automatic: 'Sjálvvirkandi'
dark: 'Myrkt tema'
accessibility: 'Atkomuligheitsinnstillingar'
- reducedColours: 'Minkaðir litir'
+ reducedColours: 'Kámari litir'
reducedItems: 'Minkað tal av vístum lutum'
ban:
From 8074c54adc7226573035ef915285790145bb7ce7 Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Sat, 21 Jun 2025 14:39:53 +0200
Subject: [PATCH 14/16] (pl)(links) kongresono
---
locale/pl/config.suml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index b8c69529f..aacb7e31b 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -2421,6 +2421,18 @@ links:
headline: 'IX Poznańska Debata o Języku: „Język a tożsamość“'
extra: ' – Anna Tess Gołębiowska (RJN) w Centrum Kultury Zamek w Poznaniu'
# 24.02.2025
+ -
+ icon: 'play-circle'
+ url: 'https://vimeo.com/1095236202'
+ headline: '„Anarchizowanie języka przez społeczność queerową”'
+ extra: ' – Andrea Vos (RJN) na Kongresono 2025'
+ quote: >
+ Czym właściwie jest język? Do kogo należy? Czy można sobie w nim grzebać, jak tylko nam się podoba?
+ Spoiler alert: jako kolektyw oddolnie grzebiący w polszczyźnie, skłaniamy się ku temu, że chyba raczej można.
+ Od pięciu lat pomagamy osobom niebinarnym wyrażać się w silnie upłciowionym języku polskim, badamy,
+ jak nasz język wygląda oraz promujemy inkluzywne podejście do polszczyzny. A nie my pierwsze i nie ostatnie!
+ Zapraszamy na prelekcję o anarchizowaniu i queerowaniu języka, pełną przykładów i drobnych ćwiczeń.
+ # 21.06.2025
mediaMentions:
-
icon: 'newspaper'
From 0ba8cfaf4f5bcfb31a8fa5850465f7c37090122e Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Sat, 21 Jun 2025 15:06:45 +0200
Subject: [PATCH 15/16] (census)(admin) allow downloading previous years
---
server/express/census.ts | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/express/census.ts b/server/express/census.ts
index f6ef6c024..e5adb73ff 100644
--- a/server/express/census.ts
+++ b/server/express/census.ts
@@ -222,7 +222,7 @@ const calculateAggregate = (config: Aggregate, answer: Set): bo
}
};
-router.get('/census/export', handleErrorAsync(async (req, res) => {
+router.get('/census/export/:edition?', handleErrorAsync(async (req, res) => {
if (!req.isGranted('census')) {
return res.status(401).json({ error: 'Unauthorised' });
}
@@ -230,11 +230,13 @@ router.get('/census/export', handleErrorAsync(async (req, res) => {
const locale = getLocale(getH3Event(req));
const config = await loadConfig(locale);
+ const edition = req.params.edition || config.census.edition;
+
const report = [];
for (const { answers: answersRaw, writins: writinsRaw } of await req.db.all>(SQL`
SELECT answers, writins FROM census
WHERE locale = ${config.locale}
- AND edition = ${config.census.edition}
+ AND edition = ${edition}
AND suspicious = 0
AND troll = 0
AND relevant = 1
From ca50f769ec1345894ca410e0aeb1dec8adf865da Mon Sep 17 00:00:00 2001
From: Andrea Vos
Date: Sat, 21 Jun 2025 15:30:13 +0200
Subject: [PATCH 16/16] (pl)(census) fix labelsRomantic baseline
---
census/analyse.py | 4 +-
.../docs/spis-2024/agab_f/labelsRomantic.html | 2 +-
locale/pl/docs/spis-2024/agab_f/stats.json | 70 +++++++++---------
.../docs/spis-2024/agab_m/labelsRomantic.html | 2 +-
locale/pl/docs/spis-2024/agab_m/stats.json | 70 +++++++++---------
.../spis-2024/by_agab/labelsRomantic.html | 2 +-
.../docs/spis-2024/by_age/labelsRomantic.html | 2 +-
.../spis-2024/by_location/labelsRomantic.html | 2 +-
.../spis-2024/by_year/labelsRomantic.html | 2 +-
.../spis-2024/general/labelsRomantic.html | 2 +-
locale/pl/docs/spis-2024/general/stats.json | 72 +++++++++----------
.../location_abroad/labelsRomantic.html | 2 +-
.../docs/spis-2024/location_abroad/stats.json | 44 ++++++------
.../location_poland/labelsRomantic.html | 2 +-
.../docs/spis-2024/location_poland/stats.json | 72 +++++++++----------
.../docs/spis-2024/older/labelsRomantic.html | 2 +-
locale/pl/docs/spis-2024/older/stats.json | 64 ++++++++---------
.../spis-2024/younger/labelsRomantic.html | 2 +-
locale/pl/docs/spis-2024/younger/stats.json | 72 +++++++++----------
19 files changed, 246 insertions(+), 244 deletions(-)
diff --git a/census/analyse.py b/census/analyse.py
index 745d9b091..ae081c8f0 100644
--- a/census/analyse.py
+++ b/census/analyse.py
@@ -194,6 +194,8 @@ def analyse(group: str, df: pd.DataFrame, full_df: pd.DataFrame, echo: bool = Fa
df_neuter = df[df['7_rodzaj neutralny'] == 1]
df_transition = df[df['22_'] == 'tak']
+ df_attraction_split = df[df['19_'] == 'tak']
+
stats = {
'size': len(df),
'size_subset_percent': percent(len(df), len(full_df)),
@@ -238,7 +240,7 @@ def analyse(group: str, df: pd.DataFrame, full_df: pd.DataFrame, echo: bool = Fa
'labelsGender': extract_question(df, 18, include_aggregates=True, remove_underscores=False),
'labelsAttractionSplit': extract_question_single(df, 19),
'labelsSexuality': extract_question(df, 20, include_aggregates=True, remove_underscores=False),
- 'labelsRomantic': extract_question(df, 21, include_aggregates=True, remove_underscores=False),
+ 'labelsRomantic': extract_question(df_attraction_split, 21, include_aggregates=True, remove_underscores=False),
'transtionAnswered': extract_question_single(df, 22),
'transitionSocial': extract_question_single(df_transition, 23),
'transitionSocialSentiment': extract_question_single_sentiment(df_transition, 23, sentiment_map=transition_sentiment),
diff --git a/locale/pl/docs/spis-2024/agab_f/labelsRomantic.html b/locale/pl/docs/spis-2024/agab_f/labelsRomantic.html
index 76bc434c5..9f6708753 100644
--- a/locale/pl/docs/spis-2024/agab_f/labelsRomantic.html
+++ b/locale/pl/docs/spis-2024/agab_f/labelsRomantic.html
@@ -6,6 +6,6 @@
+