Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #4339 from minvws/release/2.52.1
Browse files Browse the repository at this point in the history
Release/2.52.1
  • Loading branch information
hasan-ozaynaci authored Jul 26, 2022
2 parents 68bb247 + 5723141 commit 71ecf26
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import css from '@styled-system/css';
import { useRouter } from 'next/router';
import { useCollapsible } from '~/utils/use-collapsible';
import { useIntl } from '~/intl';
import { Cell, HeaderCell, Row, StyledTable } from '.';
Expand Down Expand Up @@ -62,6 +63,7 @@ const VaccineCampaignRow = ({
const { formatNumber } = useIntl();
const collapsible = useCollapsible({ isOpen: isFirst });
const isOpen = collapsible.isOpen;
const { locale = 'nl' } = useRouter();

return (
<Row isLast={isLast} isOpen={isOpen} onClick={() => collapsible.toggle()}>
Expand All @@ -70,7 +72,11 @@ const VaccineCampaignRow = ({
<tbody>
<tr>
<Cell css={css({ pt: 3 })} mobile>
<strong>{campaign.vaccine_campaign_name_nl}</strong>
<strong>
{locale === 'nl'
? campaign.vaccine_campaign_name_nl
: campaign.vaccine_campaign_name_en}
</strong>
</Cell>

<Cell css={css({ pt: 3 })} alignRight mobile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import css from '@styled-system/css';
import { useRouter } from 'next/router';
import { useCollapsible } from '~/utils/use-collapsible';
import { useIntl } from '~/intl';
import { Cell, HeaderCell, Row, StyledTable } from '.';
Expand Down Expand Up @@ -62,15 +63,20 @@ const VaccineCampaignRow = ({
const { formatNumber } = useIntl();
const collapsible = useCollapsible({ isOpen: isFirst });
const isOpen = collapsible.isOpen;
const { locale = 'nl' } = useRouter();

return (
<Row isLast={isLast} isOpen={isOpen} onClick={() => collapsible.toggle()}>
<Cell colSpan={4} css={css({ p: 0 })}>
<StyledTable>
<tbody>
<tr>
<Cell css={css({ fontWeight: 'bold' })}>
{campaign.vaccine_campaign_name_nl}
<Cell>
<strong>
{locale === 'nl'
? campaign.vaccine_campaign_name_nl
: campaign.vaccine_campaign_name_en}
</strong>
</Cell>

<Cell>
Expand Down
6 changes: 3 additions & 3 deletions packages/app/src/pages/landelijk/vaccinaties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ const VaccinationPage = (props: StaticProps<typeof getStaticProps>) => {
<BoosterShotCoveragePerAgeGroup
text={textNl.vaccination_coverage}
title={textNl.vaccination_coverage.title}
description={textNl.vaccination_coverage.toelichting}
description={textNl.vaccination_coverage.description}
sortingOrder={[
'80+',
'70-79',
Expand Down Expand Up @@ -425,8 +425,8 @@ const VaccinationPage = (props: StaticProps<typeof getStaticProps>) => {

<VaccineCoveragePerAgeGroup
text={textNl.vaccination_coverage}
title={textNl.vaccination_coverage.title}
description={textNl.vaccination_coverage.toelichting}
title={textNl.archived.vaccination_coverage.title}
description={textNl.archived.vaccination_coverage.description}
sortingOrder={[
'81+',
'71-80',
Expand Down
4 changes: 4 additions & 0 deletions packages/cms/src/lokalize/key-mutations.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ timestamp,action,key,document_id,move_to
2022-07-19T07:40:03.828Z,move,pages.vaccinationsPage.nl.vaccine_campaigns.campaigns.primary_shot_description,M1X5uhtA0L6eSCc3lIjlcD,pages.vaccinationsPage.nl.vaccine_campaigns.campaigns.primary_serie_description
2022-07-19T07:40:03.854Z,move,pages.vaccinationsPage.nl.vaccine_campaigns.campaigns.repeating_shot_description,M1X5uhtA0L6eSCc3lIjl3t,pages.vaccinationsPage.nl.vaccine_campaigns.campaigns.repeat_vaccination_description
2022-07-19T07:40:03.857Z,move,pages.vaccinationsPage.nl.vaccine_campaigns.headers.previous_week,rqPl4RDgHRhhQeuZ9blk3g,pages.vaccinationsPage.nl.vaccine_campaigns.headers.last_week
2022-07-25T12:05:15.460Z,add,pages.vaccinationsPage.nl.archived.vaccination_coverage.title,pSO29YJFzVDfBLprQK2naM,__
2022-07-25T12:05:16.484Z,add,pages.vaccinationsPage.nl.archived.vaccination_coverage.description,pSO29YJFzVDfBLprQK2nsV,__
2022-07-25T12:05:16.485Z,move,pages.vaccinationsPage.nl.vaccination_coverage.toelichting,jF33EuwumlGuwav2FD4660,pages.vaccinationsPage.nl.vaccination_coverage.description
2022-07-25T12:05:16.486Z,move,pages.vaccinationsPage.nl.vaccination_coverage.toelichting_booster_shot,hqivmGf8UPzCLjKFjHrGgv,pages.vaccinationsPage.nl.vaccination_coverage.description_booster_shot

0 comments on commit 71ecf26

Please sign in to comment.