diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d465e38ba..97495a46b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,21 +37,11 @@ check: apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev -y 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' + - 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 - # 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" @@ -59,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" @@ -214,7 +203,15 @@ deploy test/purple: ENVIRONMENT_INSTANCE: 'purple' ENVIRONMENT_DOMAIN: 'test-purple.pronouns.page' -# include: -# - template: Security/Dependency-Scanning.gitlab-ci.yml -# -# Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136 +include: + - template: Jobs/Secret-Detection.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 + +variables: + AST_ENABLE_MR_PIPELINES: true + DS_EXCLUDED_ANALYZERS: gemnasium-python + DS_MAX_DEPTH: 4 + CS_QUIET: true 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! diff --git a/census/analyse.py b/census/analyse.py index edfaa253f..21fcfb762 100644 --- a/census/analyse.py +++ b/census/analyse.py @@ -215,6 +215,7 @@ 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['24_'] == 'tak'] df_english = df[df['19_nie znam / nie używam angielskiego'] != 1].drop('19_nie znam / nie używam angielskiego', axis=1) + df_attraction_split = df[df['19_'] == 'tak'] stats = { 'size': len(df), @@ -263,7 +264,7 @@ def analyse(group: str, df: pd.DataFrame, full_df: pd.DataFrame, echo: bool = Fa 'labelsGender': extract_question(df, 20, include_aggregates=True, remove_underscores=False), 'labelsAttractionSplit': extract_question_single(df, 21), 'labelsSexuality': extract_question(df, 22, include_aggregates=True, remove_underscores=False), - 'labelsRomantic': extract_question(df, 23, include_aggregates=True, remove_underscores=False), + 'labelsRomantic': extract_question(df_attraction_split, 23, include_aggregates=True, remove_underscores=False), 'transtionAnswered': extract_question_single(df, 24), 'transitionSocial': extract_question_single(df_transition, 25), 'transitionSocialSentiment': extract_question_single_sentiment(df_transition, 25, sentiment_map=transition_sentiment), 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; + } }; diff --git a/locale/fo/translations.suml b/locale/fo/translations.suml index 5d01a5d5a..4824e1e93 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, @@ -1041,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)' @@ -1499,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: @@ -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' diff --git a/locale/pl/config.suml b/locale/pl/config.suml index 45e99a2ae..8f5a7de96 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' 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 @@