Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mvj 177 footer links #130

Merged
merged 5 commits into from
Nov 27, 2024
Merged

Mvj 177 footer links #130

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
042ac77
footer: remove social links, fix customer service link
henrinie-nc Nov 25, 2024
2e1543e
footer: fix paths to dataprotection and registerstatement urls
henrinie-nc Nov 25, 2024
5bee9d0
footer: add registerstatement url
henrinie-nc Nov 25, 2024
32514fd
footer: add swedish register statement url
henrinie-nc Nov 27, 2024
7ade7ab
footer: fix typo in footer link prop name
henrinie-nc Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 17 additions & 49 deletions src/footer/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import {
Footer,
Logo,
logoFiDark,
IconFacebook,
IconX,
IconInstagram,
IconLinkedin,
} from 'hds-react';
import { Footer, Logo, logoFiDark } from 'hds-react';
import { useTranslation } from 'react-i18next';
import { naviLinks } from '../topNavigation/topNavigation';
import { getRouteById } from '../root/helpers';
Expand All @@ -29,44 +21,17 @@ const FooterComponent = (): JSX.Element => {
/>
))}
</Footer.Navigation>
<Footer.Utilities
soMeLinks={[
<Footer.Link
href="https://www.facebook.com/kaupunkiymparisto"
title={t(
'footer.some.facebook',
'Helsingin kaupungin Facebook-tili',
)}
icon={<IconFacebook />}
key="facebook"
/>,
<Footer.Link
href="https://twitter.com/HelsinkiKymp"
title={t('footer.some.twitter', 'Helsingin kaupungin Twitter-tili')}
icon={<IconX />}
key="twitter"
/>,
<Footer.Link
href="https://www.instagram.com/kaupunkiymparisto"
title={t(
'footer.some.instagram',
'Helsingin kaupungin Instagram-tili',
)}
icon={<IconInstagram />}
key="instragram"
/>,
<Footer.Link
href="https://www.linkedin.com/company/kaupunkiymparisto"
title={t(
'footer.some.linkedin',
'Helsingin kaupungin LinkedIn-tili',
)}
icon={<IconLinkedin />}
key="linkedin"
/>,
]}
>
{t('footer.customerService', 'Kaupunkiympäristön asiakaspalvelu')}
<Footer.Utilities>
<Footer.Link
label={t(
'footer.customerService.label',
'Kaupunkiympäristön asiakaspalvelu',
)}
href={t(
'footer.customerService.url',
'https://www.hel.fi/fi/kaupunkiymparisto-ja-liikenne/kaupunkiympariston-asiakaspalvelu',
)}
/>
</Footer.Utilities>
<Footer.Base
logo={
Expand All @@ -92,13 +57,16 @@ const FooterComponent = (): JSX.Element => {
<Footer.Link
label={t('footer.dataProtection.label', 'Tietosuoja')}
href={t(
'footer.accessabilityStatement.url',
'footer.dataProtection.url',
'https://www.hel.fi/fi/paatoksenteko-ja-hallinto/tietoa-helsingista/tietosuoja-ja-tiedonhallinta/tietosuoja',
)}
/>
<Footer.Link
label={t('footer.registerStatement.label', 'Rekisteriseloste')}
href={t('footer.accessabilityStatement.url', '#')}
href={t(
'footer.registerStatement.url',
'https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kymp/Tonttien%20hankinnan%20ja%20luovutuksen%20asiakasrekisteri.pdf',
)}
/>
</Footer.Base>
</Footer>
Expand Down
11 changes: 4 additions & 7 deletions src/i18n/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,9 @@
"alt": "Helsinki logo"
},
"text": "Plot rental",
"customerService": "Urban Environment Division customer service",
"some": {
"facebook": "City of Helsinki on Facebook",
"twitter": "City of Helsinki on X",
"instagram": "City of Helsinki on Instagram",
"linkedin": "City of Helsinki on LinkedIn"
"customerService": {
"label": "Urban Environment Division Customer Service",
"url": "https://www.hel.fi/en/urban-environment-and-traffic/urban-environment-division-customer-services"
},
"moveToTop": "Move to top",
"accessabilityStatement": {
Expand All @@ -355,7 +352,7 @@
},
"registerStatement": {
"label": "Privacy statement",
"url": "#"
"url": "https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kymp/Tonttien%20hankinnan%20ja%20luovutuksen%20asiakasrekisteri.pdf"
}
},
"frontPage": {
Expand Down
11 changes: 4 additions & 7 deletions src/i18n/fi/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,9 @@
"alt": "Helsinki logo"
},
"text": "Tonttihaku",
"customerService": "Kaupunkiympäristön asiakaspalvelu",
"some": {
"facebook": "Helsingin kaupunki Facebookissa",
"twitter": "Helsingin kaupunki X:ssä",
"instagram": "Helsingin kaupunki Instagramissa",
"linkedin": "Helsingin kaupunki LinkedInissä"
"customerService": {
"label": "Kaupunkiympäristön asiakaspalvelu",
"url": "https://www.hel.fi/fi/kaupunkiymparisto-ja-liikenne/kaupunkiympariston-asiakaspalvelu"
},
"moveToTop": "Siirry ylös",
"accessabilityStatement": {
Expand All @@ -354,7 +351,7 @@
},
"registerStatement": {
"label": "Rekisteriseloste",
"url": "#"
"url": "https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kymp/Tonttien%20hankinnan%20ja%20luovutuksen%20asiakasrekisteri.pdf"
}
},
"frontPage": {
Expand Down
11 changes: 4 additions & 7 deletions src/i18n/sv/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,9 @@
"alt": "Helsingfors logotyp"
},
"text": "Tomtansökan",
"customerService": "Stadsmiljösektorns kundservice",
"some": {
"facebook": "Helsingfors stad på Facebook",
"twitter": "Helsingfors stad på X",
"instagram": "Helsingfors stad på Instagram",
"linkedin": "Helsingfors stad på LinkedIn"
"customerService": {
"label": "Stadsmiljösektorns kundservice",
"url": "https://www.hel.fi/sv/stadsmiljo-och-trafik/stadsmiljosektorns-kundtjanst"
},
"moveToTop": "Gå upp",
"accessabilityStatement": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't broken or part of the changes, but this variable name has a typo. Should be accessibilityStatement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@juho-kettunen-nc fixed, could yo ure-review?

Expand All @@ -355,7 +352,7 @@
},
"registerStatement": {
"label": "Registerbeskrivning",
"url": "#"
"url": "https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kymp/Tonttien%20hankinnan%20ja%20luovutuksen%20asiakasrekisteri.pdf"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the swedish version link was posted to ticket a few minutes ago, so we can use that

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

}
},
"frontPage": {
Expand Down