From 7d46879560932bc108e00a99e2ae130427fe3ed2 Mon Sep 17 00:00:00 2001 From: Risto Salama Date: Fri, 17 May 2024 12:24:30 +0300 Subject: [PATCH] Fix hakukohde translation --- src/app/(root)/haku-table.tsx | 14 ++++++++++---- src/app/lib/koodisto.ts | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/(root)/haku-table.tsx b/src/app/(root)/haku-table.tsx index 4cf9c3a4..cfdabf35 100644 --- a/src/app/(root)/haku-table.tsx +++ b/src/app/(root)/haku-table.tsx @@ -9,6 +9,8 @@ import ListTable, { } from '../components/table/list-table'; import { Haku } from '../lib/kouta-types'; import { useUserLanguage } from '../hooks/useAsiointiKieli'; +import { Language } from '../lib/localization/localization-types'; +import { translateName } from '../lib/localization/translation-utils'; export const HakuTable = ({ haut, @@ -21,16 +23,20 @@ export const HakuTable = ({ sort: string; setSort: (sort: string) => void; }) => { - const getMatchingHakutapa = (hakutapaKoodiUri: string) => - hakutavat.find((tapa: Koodi) => hakutapaKoodiUri.startsWith(tapa.koodiUri)) - ?.nimi.fi; + const getMatchingHakutapa = + (userLanguage: Language) => (hakutapaKoodiUri: string) => { + const matching = hakutavat.find((tapa: Koodi) => + hakutapaKoodiUri.startsWith(tapa.koodiUri), + ); + return matching ? translateName(matching.nimi, userLanguage) : undefined; + }; const userLanguage = useUserLanguage(); const columns = [ makeHakuColumn(userLanguage), makeTilaColumn(), - makeHakutapaColumn(getMatchingHakutapa), + makeHakutapaColumn(getMatchingHakutapa(userLanguage)), makeKoulutuksenAlkamiskausiColumn(), makeCountColumn({ title: 'Hakukohteet', diff --git a/src/app/lib/koodisto.ts b/src/app/lib/koodisto.ts index 597053aa..f8c948d2 100644 --- a/src/app/lib/koodisto.ts +++ b/src/app/lib/koodisto.ts @@ -13,7 +13,8 @@ async function getKoodit(koodisto: string): Promise { metadata: [{ nimi: string; kieli: string }], ): string => { const matchingData = metadata.find( - (m: { nimi: string; kieli: string }) => m.kieli === language, + (m: { nimi: string; kieli: string }) => + m.kieli.toLowerCase() === language, ); return matchingData ? matchingData.nimi : ''; };