Skip to content

Commit

Permalink
Merge pull request #8469 from CitizenLabDotCo/master
Browse files Browse the repository at this point in the history
 Release 2024-07-22_2
  • Loading branch information
EdwinKato authored Jul 22, 2024
2 parents 13ea11f + ee38f60 commit 7b1b8be
Show file tree
Hide file tree
Showing 39 changed files with 124 additions and 47 deletions.
12 changes: 6 additions & 6 deletions back/config/locales/fi-FI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ fi:
community_description: Yhteisökehitys
services: Julkiset palvelut
services_description: Julkiset palvelut
other: Muut
other_description: Muut
other: Muu
other_description: Muu
static_pages:
terms_and_conditions_title: Käyttöehdot
terms_and_conditions_body: >
Expand All @@ -122,7 +122,7 @@ fi:
events:
title: Tapahtumat
about:
title: Noin
title: Tietoja projektista
faq:
title: FAQ
projects:
Expand All @@ -143,7 +143,7 @@ fi:
gender:
title: Sukupuoli
birthyear:
title: Syntymävuosi
title: Ikä
domicile:
title: Asuinpaikka
education:
Expand Down Expand Up @@ -207,9 +207,9 @@ fi:
title: Lisäinformaatio
custom_field_options:
gender:
male: Uros
male: Mies
female: Nainen
unspecified: Muut
unspecified: Muu
domicile:
outside: Jossain muualla
education:
Expand Down
8 changes: 4 additions & 4 deletions back/engines/free/email_campaigns/config/locales/fi-FI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fi:
"link_privacy_policy": "Tietosuojakäytäntö"
"link_terms_conditions": "käyttöehdot"
"link_unsubscribe": "Lopeta tilaus"
"powered_by": "Voimanlähteenä"
"powered_by": "Yhteistyössä"
"statement": "Go Vocal lähetti sinulle tämän sähköpostin käyttäjän %{organizationName}puolesta, koska olet %{organizationLink}rekisteröity käyttäjä. Voit %{unsubscribeLink} , jos et halua saada näitä sähköposteja jatkossa."
"unsubscribe_text": "Lopeta tilaus"
follow:
Expand Down Expand Up @@ -152,7 +152,7 @@ fi:
yesterday_by_author: 'Eilen %{author}'
today_by_author: 'Tänään %{author}'
x_days_ago_by_author: '%{x} päivää sitten, kirjoittaja %{author}'
idea_section: Ideoita
idea_section: Ideat
initiative_section: ehdotuksia
title_initiatives_past_week: 'Sinulle on määrätty uusia ehdotuksia'
title_successful_initiatives_past_week: 'Sinulle osoitetut ehdotukset, jotka saavuttivat kynnyksen'
Expand Down Expand Up @@ -595,8 +595,8 @@ fi:
comments: 'Kommentit'
content_moderation: 'Sisällön moderointi'
events: 'Tapahtumat'
general: 'Kenraali'
inputs: 'Tulot'
general: 'Yleinen'
inputs: 'Toiminnat'
internal_comments: 'Sisäiset kommentit'
permissions: 'Käyttöoikeudet'
projects: 'Projektit'
Expand Down
7 changes: 7 additions & 0 deletions front/app/components/HorizontalScroll/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import {
} from '@citizenlab/cl2-component-library';
import styled, { useTheme } from 'styled-components';

import { useIntl } from 'utils/cl-intl';

import messages from './messages';

const StyledContainer = styled(Box)`
display: flex;
gap: 16px;
Expand Down Expand Up @@ -43,6 +47,7 @@ interface Props {
const HorizontalScroll = ({ children, containerRole }: Props) => {
const theme = useTheme();
const isSmallerThanPhone = useBreakpoint('phone');
const { formatMessage } = useIntl();
const containerRef = React.useRef<HTMLDivElement>(null);
// Used to determine when the scroll buttons should be disabled (E.g. At scroll end, disable the right button)
const [atScrollStart, setAtScrollStart] = useState(true);
Expand Down Expand Up @@ -100,6 +105,7 @@ const HorizontalScroll = ({ children, containerRole }: Props) => {
p="0px"
my="auto"
className="e2e-event-previews-scroll-left"
ariaLabel={formatMessage(messages.scrollLeftLabel)}
/>
</Box>
<StyledContainer ref={containerRef} role={containerRole}>
Expand All @@ -119,6 +125,7 @@ const HorizontalScroll = ({ children, containerRole }: Props) => {
buttonStyle="text"
p="0px"
className="e2e-event-previews-scroll-right"
ariaLabel={formatMessage(messages.scrollRightLabel)}
/>
</Box>
</Box>
Expand Down
12 changes: 12 additions & 0 deletions front/app/components/HorizontalScroll/messages.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { defineMessages } from 'react-intl';

export default defineMessages({
scrollLeftLabel: {
id: 'app.components.HorizontalScroll.scrollLeftLabel',
defaultMessage: 'Scroll left.',
},
scrollRightLabel: {
id: 'app.components.HorizontalScroll.scrollRightLabel',
defaultMessage: 'Scroll right.',
},
});
2 changes: 2 additions & 0 deletions front/app/translations/ach-UG.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@
"app.components.HookForm.Feedback.submissionError": "crwdns213082:0crwdne213082:0",
"app.components.HookForm.Feedback.submissionErrorTitle": "crwdns213084:0crwdne213084:0",
"app.components.HookForm.Feedback.successMessage": "crwdns213086:0crwdne213086:0",
"app.components.HorizontalScroll.scrollLeftLabel": "crwdns2677447:0crwdne2677447:0",
"app.components.HorizontalScroll.scrollRightLabel": "crwdns2677449:0crwdne2677449:0",
"app.components.IdeaCards.a11y_ideasHaveBeenSorted": "crwdns2400638:0{sortOder}crwdne2400638:0",
"app.components.IdeaCards.showMore": "crwdns213088:0crwdne213088:0",
"app.components.IdeasMap.a11y_hideIdeaCard": "crwdns213144:0crwdne213144:0",
Expand Down
2 changes: 1 addition & 1 deletion front/app/translations/admin/en-CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"app.components.AdminPage.SettingsPage.homePageCustomizableSection": "Homepage customizable section",
"app.components.AnonymousPostingToggle.betaLabel": "BETA",
"app.components.AnonymousPostingToggle.userAnonymity": "User anonymity",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "Users will be able to hide their identity from other users, project managers and admins. These contributions can still be moderated.",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "User name and email will be hidden from all other users, project managers and admins. You can still moderate contributions but demographic data will be anonymised and not recorded. ",
"app.components.AnonymousPostingToggle.userAnonymityLabelText": "Allow users to participate anonymously",
"app.components.AnonymousPostingToggle.userAnonymityLabelTooltip2": "Users may still choose to participate with their real name, but they will have the option to submit contributions anonymously if they choose to do so. All users will still need to comply with the requirements set in the Access Rights tab for their contributions to go through. User profile data will not be available on the participation data export.",
"app.components.AnonymousPostingToggle.userAnonymitySupportTooltip": "Learn more about user anonymity in our {supportArticle}.",
Expand Down
2 changes: 1 addition & 1 deletion front/app/translations/admin/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"app.components.AdminPage.SettingsPage.homePageCustomizableSection": "Homepage customisable section",
"app.components.AnonymousPostingToggle.betaLabel": "BETA",
"app.components.AnonymousPostingToggle.userAnonymity": "User anonymity",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "Users will be able to hide their identity from other users, project managers and admins. These contributions can still be moderated.",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "Users name and email will be hidden from all other users, project managers and admins. You can still moderate contributions but demographic data will be anonymized and not recorded. ",
"app.components.AnonymousPostingToggle.userAnonymityLabelText": "Allow users to participate anonymously",
"app.components.AnonymousPostingToggle.userAnonymityLabelTooltip2": "Users may still choose to participate with their real name, but they will have the option to submit contributions anonymously if they choose to do so. All users will still need to comply with the requirements set in the Access Rights tab for their contributions to go through. User profile data will not be available on the participation data export.",
"app.components.AnonymousPostingToggle.userAnonymitySupportTooltip": "Learn more about user anonymity in our {supportArticle}.",
Expand Down
2 changes: 1 addition & 1 deletion front/app/translations/admin/en-IE.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"app.components.AdminPage.SettingsPage.homePageCustomizableSection": "Homepage customizable section",
"app.components.AnonymousPostingToggle.betaLabel": "BETA",
"app.components.AnonymousPostingToggle.userAnonymity": "User anonymity",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "Users will be able to hide their identity from other users, project managers and admins. These contributions can still be moderated.",
"app.components.AnonymousPostingToggle.userAnonymityLabelSubtext": "User name and email will be hidden from all other users, project managers and admins. You can still moderate contributions but demographic data will be anonymised and not recorded. ",
"app.components.AnonymousPostingToggle.userAnonymityLabelText": "Allow users to participate anonymously",
"app.components.AnonymousPostingToggle.userAnonymityLabelTooltip2": "Users may still choose to participate with their real name, but they will have the option to submit contributions anonymously if they choose to do so. All users will still need to comply with the requirements set in the Access Rights tab for their contributions to go through. User profile data will not be available on the participation data export.",
"app.components.AnonymousPostingToggle.userAnonymitySupportTooltip": "Learn more about user anonymity in our {supportArticle}.",
Expand Down
28 changes: 14 additions & 14 deletions front/app/translations/admin/fi-FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@
"app.containers.Admin.projects.project.offlineInputs.TopBar.selectAPhase": "Valitse, mihin vaiheeseen haluat lisätä nämä tulot.",
"app.containers.Admin.projects.project.offlineInputs.inputImporter": "Syötteiden maahantuoja",
"app.containers.Admin.projects.project.participation.comments": "Kommentit",
"app.containers.Admin.projects.project.participation.inputs": "Tulot",
"app.containers.Admin.projects.project.participation.inputs": "Toiminnat",
"app.containers.Admin.projects.project.participation.participantsTimeline": "Osallistujien aikajana",
"app.containers.Admin.projects.project.participation.reactions": "Reaktiot",
"app.containers.Admin.projects.project.participation.selectPeriod": "Valitse ajanjakso",
Expand All @@ -960,7 +960,7 @@
"app.containers.Admin.projects.project.survey.analysisSelectQuestionsForAnalysis": "Valitse aiheeseen liittyvät kysymykset analysoitavaksi",
"app.containers.Admin.projects.project.survey.analysisSelectQuestionsSubtitle": "Haluatko sisällyttää muita aiheeseen liittyviä kysymyksiä {question}-analyysiisi?",
"app.containers.Admin.projects.project.survey.cancel": "Peruuttaa",
"app.containers.Admin.projects.project.survey.consentModalButton": "Jatkaa",
"app.containers.Admin.projects.project.survey.consentModalButton": "Jatka",
"app.containers.Admin.projects.project.survey.consentModalCancel": "Peruuttaa",
"app.containers.Admin.projects.project.survey.consentModalCheckbox": "Hyväksyn OpenAI:n käytön tietojen käsittelijänä tässä projektissa",
"app.containers.Admin.projects.project.survey.consentModalText1": "Jatkamalla hyväksyt OpenAI:n käytön tietojen käsittelijänä tässä projektissa.",
Expand Down Expand Up @@ -1015,7 +1015,7 @@
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ActiveUsersWidget.ChartWidgetSettings.showComparisonLastPeriod": "Näytä vertailu viimeiseen ajanjaksoon",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ActiveUsersWidget.ChartWidgetSettings.youNeedToSelectADateRange": "Sinun on ensin valittava ajanjakso.",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.comments": "Kommentit",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.inputs": "Tulot",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.inputs": "Toiminnat",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.participation": "Osallistuminen",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.showComments": "Näytä kommentit",
"app.containers.Admin.reporting.components.ReportBuilder.Widgets.ChartWidgets.ParticipationWidget.showInputs": "Näytä tulot",
Expand Down Expand Up @@ -1237,10 +1237,10 @@
"app.containers.AdminPage.DashboardPage.helmetTitle": "Järjestelmänvalvojan hallintapaneelisivu",
"app.containers.AdminPage.DashboardPage.hiddenLabelPickResourceByProject": "Valitse näytettävä resurssi projektin mukaan",
"app.containers.AdminPage.DashboardPage.hiddenLabelPickResourceByTopic": "Valitse tunnisteella näytettävä resurssi",
"app.containers.AdminPage.DashboardPage.inputs1": "Tulot",
"app.containers.AdminPage.DashboardPage.inputs1": "Toiminnat",
"app.containers.AdminPage.DashboardPage.inputsByStatusTitle1": "Syötteet tilan mukaan",
"app.containers.AdminPage.DashboardPage.labelGroupFilter": "Valitse käyttäjäryhmä",
"app.containers.AdminPage.DashboardPage.male": "Uros",
"app.containers.AdminPage.DashboardPage.male": "Mies",
"app.containers.AdminPage.DashboardPage.month": "kuukausi",
"app.containers.AdminPage.DashboardPage.noData": "Näytettäviä tietoja ei ole.",
"app.containers.AdminPage.DashboardPage.noPhase": "Tälle projektille ei ole luotu vaihetta",
Expand Down Expand Up @@ -1359,7 +1359,7 @@
"app.containers.AdminPage.Project.settings.back": "Takaisin",
"app.containers.AdminPage.Project.settings.description": "Kuvaus",
"app.containers.AdminPage.Project.settings.events": "Tapahtumat",
"app.containers.AdminPage.Project.settings.general": "Kenraali",
"app.containers.AdminPage.Project.settings.general": "Yleinen",
"app.containers.AdminPage.Project.settings.projectTags": "Projektin tunnisteet",
"app.containers.AdminPage.ProjectDashboard.helmetDescription": "Luettelo alustalla olevista projekteista",
"app.containers.AdminPage.ProjectDashboard.helmetTitle": "Projektien hallintapaneeli",
Expand Down Expand Up @@ -1537,7 +1537,7 @@
"app.containers.AdminPage.ProjectEdit.areasLabelTooltipLinkText": "tässä",
"app.containers.AdminPage.ProjectEdit.areasNoneLabel": "Ei erityistä aluetta",
"app.containers.AdminPage.ProjectEdit.areasNoneLabelDescription": "Projekti ei näy, kun suodatetaan alueen mukaan.",
"app.containers.AdminPage.ProjectEdit.areasSelectionLabel": "Valinta",
"app.containers.AdminPage.ProjectEdit.areasSelectionLabel": "Valitut",
"app.containers.AdminPage.ProjectEdit.areasSelectionLabelDescription": "Projekti näkyy valituilla aluesuodattimilla.",
"app.containers.AdminPage.ProjectEdit.cardDisplay": "Kortit",
"app.containers.AdminPage.ProjectEdit.conductVotingOrPrioritizationDescriptionText2": "Valitse äänestystapa ja pyydä käyttäjiä priorisoimaan muutaman eri vaihtoehdon välillä.",
Expand Down Expand Up @@ -1580,7 +1580,7 @@
"app.containers.AdminPage.ProjectEdit.formBuilder.successMessage": "Lomake tallennettu onnistuneesti",
"app.containers.AdminPage.ProjectEdit.formBuilder.surveyEnd2": "Kyselyn loppu",
"app.containers.AdminPage.ProjectEdit.fromATemplate": "Mallista",
"app.containers.AdminPage.ProjectEdit.generalTab": "Kenraali",
"app.containers.AdminPage.ProjectEdit.generalTab": "Yleinen",
"app.containers.AdminPage.ProjectEdit.generalTab.publicationStatusTooltip": "Valitse, onko tämä projekti \"luonnos\", \"julkaistu\" vai \"arkistoitu\" (ei näy, näytetään ja aktiivinen, näytetään mutta ei-aktiivinen)",
"app.containers.AdminPage.ProjectEdit.google_forms": "Google Forms",
"app.containers.AdminPage.ProjectEdit.headerImageInputLabel": "Otsikkokuva",
Expand Down Expand Up @@ -2016,7 +2016,7 @@
"app.containers.AdminPage.SettingsPage.tabInputStatuses": "Syöttötilat",
"app.containers.AdminPage.SettingsPage.tabPolicies": "Käytännöt",
"app.containers.AdminPage.SettingsPage.tabRegistration": "Rekisteröinti",
"app.containers.AdminPage.SettingsPage.tabSettings": "Kenraali",
"app.containers.AdminPage.SettingsPage.tabSettings": "Yleinen",
"app.containers.AdminPage.SettingsPage.tabTopics": "Tag Manager",
"app.containers.AdminPage.SettingsPage.tabWidgets": "Widget",
"app.containers.AdminPage.SettingsPage.tablet": "Tabletti",
Expand Down Expand Up @@ -2283,7 +2283,7 @@
"app.containers.AdminPage.projects.project.analysis.Tags.launch": "Tuoda markkinoille",
"app.containers.AdminPage.projects.project.analysis.Tags.noActiveFilters": "Ei aktiivisia suodattimia",
"app.containers.AdminPage.projects.project.analysis.Tags.noTags": "Käytä tunnisteita syötteiden jakamiseen ja suodattamiseen, jotta voit tehdä tarkempia tai kohdennettuja yhteenvetoja.",
"app.containers.AdminPage.projects.project.analysis.Tags.other": "Muut",
"app.containers.AdminPage.projects.project.analysis.Tags.other": "Muu",
"app.containers.AdminPage.projects.project.analysis.Tags.platformTags": "Tunnisteet: Alustatunnisteet",
"app.containers.AdminPage.projects.project.analysis.Tags.platformTagsDescription": "Määritä olemassa olevat alustatunnisteet, jotka kirjoittaja valitsi lähettäessään",
"app.containers.AdminPage.projects.project.analysis.Tags.recommended": "Suositeltava",
Expand Down Expand Up @@ -2320,7 +2320,7 @@
"app.containers.AdminPage.projects.project.analysis.TopBar.all": "Kaikki",
"app.containers.AdminPage.projects.project.analysis.TopBar.author": "Tekijä",
"app.containers.AdminPage.projects.project.analysis.TopBar.below": "Alla",
"app.containers.AdminPage.projects.project.analysis.TopBar.birthyear": "Syntymävuosi",
"app.containers.AdminPage.projects.project.analysis.TopBar.birthyear": "Ikä",
"app.containers.AdminPage.projects.project.analysis.TopBar.domicile": "Kotipaikka",
"app.containers.AdminPage.projects.project.analysis.TopBar.engagement": "Sitoumus",
"app.containers.AdminPage.projects.project.analysis.TopBar.filters": "Suodattimet",
Expand Down Expand Up @@ -2551,7 +2551,7 @@
"app.containers.admin.ideaStatuses.form.acceptedFieldCodeTitle": "Hyväksytty",
"app.containers.admin.ideaStatuses.form.category": "Kategoria",
"app.containers.admin.ideaStatuses.form.categoryDescription": "Valitse luokka, joka parhaiten edustaa tilaasi. Tämä valinta auttaa analytiikkatyökaluamme käsittelemään ja analysoimaan viestejä tarkemmin.",
"app.containers.admin.ideaStatuses.form.customFieldCodeTitle": "Muut",
"app.containers.admin.ideaStatuses.form.customFieldCodeTitle": "Muu",
"app.containers.admin.ideaStatuses.form.fieldColor": "Väri",
"app.containers.admin.ideaStatuses.form.fieldDescription": "Tilan kuvaus",
"app.containers.admin.ideaStatuses.form.fieldDescriptionError": "Anna tilakuvaus kaikille kielille",
Expand Down Expand Up @@ -2590,7 +2590,7 @@
"app.containers.admin.project.permissions.permissionsEmailConfirmLabel": "Käyttäjät, joilla on vahvistettu sähköpostiosoite",
"app.containers.admin.project.permissions.permissionsEmailConfirmLabelDescription": "Kuka tahansa voi osallistua lähettämällä ja vahvistanut sähköpostiosoitteensa.",
"app.containers.admin.project.permissions.permissionsEveryoneEmailLabel": "Kaikki, joilla on vahvistettu sähköpostiosoite",
"app.containers.admin.project.permissions.permissionsSelectionLabel": "Valinta",
"app.containers.admin.project.permissions.permissionsSelectionLabel": "Valitut",
"app.containers.admin.project.permissions.permissionsSelectionLabelDescription": "Tiettyjen käyttäjäryhmien käyttäjät voivat osallistua. Voit hallita käyttäjäryhmiä Käyttäjät-välilehdellä.",
"app.containers.admin.project.permissions.permissionsUsersLabel": "Rekisteröityneet käyttäjät",
"app.containers.admin.project.permissions.permissionsUsersLabelDescription": "Käyttäjät, jotka ovat luoneet tilinsä salasanalla, voivat osallistua.",
Expand All @@ -2617,7 +2617,7 @@
"app.modules.commercial.analytics.admin.components.Invitations.pending": "Odottaa",
"app.modules.commercial.analytics.admin.components.Invitations.totalInvites": "Lähetetyt kutsut yhteensä",
"app.modules.commercial.analytics.admin.components.PostFeedback.goToInputManager": "Siirry Input Manageriin",
"app.modules.commercial.analytics.admin.components.PostFeedback.inputs": "Tulot",
"app.modules.commercial.analytics.admin.components.PostFeedback.inputs": "Toiminnat",
"app.modules.commercial.analytics.admin.components.ProjectStatus.active": "Aktiivinen",
"app.modules.commercial.analytics.admin.components.ProjectStatus.activeToolTip": "Projektit, joita ei ole arkistoitu ja jotka näkyvät kotisivun Aktiivinen-taulukossa",
"app.modules.commercial.analytics.admin.components.ProjectStatus.archived": "Arkistoitu",
Expand Down
Loading

0 comments on commit 7b1b8be

Please sign in to comment.