From 754ae8d06b08df007bd52d0342e9233576e6fbce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Andreas=20S=C3=B8rs=C3=A6ther?= Date: Tue, 21 Jan 2025 10:03:47 +0100 Subject: [PATCH] fiks --- src/komponenter/Banner/BannerNAVAnsatt.tsx | 7 +++---- src/utils/datoUtils.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/komponenter/Banner/BannerNAVAnsatt.tsx b/src/komponenter/Banner/BannerNAVAnsatt.tsx index ed61095d..a3cc5e2d 100644 --- a/src/komponenter/Banner/BannerNAVAnsatt.tsx +++ b/src/komponenter/Banner/BannerNAVAnsatt.tsx @@ -9,9 +9,8 @@ import Nytt from '../NyttIAppen/Nytt'; import './Banner.less'; import { useAvtale } from '@/AvtaleProvider'; import { useFeatureToggles } from '@/FeatureToggleProvider'; -import { addDays, max, differenceInDays, endOfDay, format } from 'date-fns'; -import { nb } from 'date-fns/locale'; -import { NORSK_DATO_FORMAT_FULL } from '@/utils/datoUtils'; +import { addDays, max, differenceInDays, endOfDay } from 'date-fns'; +import { formaterDato, NORSK_DATO_FORMAT_FULL } from '@/utils/datoUtils'; interface Props { tekst: string; @@ -36,7 +35,7 @@ const formaterSlettetidspunkt = (sistEndret: string) => { if (antallDager < 14) { return `${antallDager} dager`; } - return `den ${format(slettetidspunkt, NORSK_DATO_FORMAT_FULL, { locale: nb })}`; + return `den ${formaterDato(slettetidspunkt, NORSK_DATO_FORMAT_FULL)}`; }; const BannerNAVAnsatt: React.FunctionComponent = (props) => { diff --git a/src/utils/datoUtils.ts b/src/utils/datoUtils.ts index c9e47f5c..eeff2502 100644 --- a/src/utils/datoUtils.ts +++ b/src/utils/datoUtils.ts @@ -41,7 +41,7 @@ export const NORSK_DATO_FORMAT_FULL = 'PPP'; /** * Formater en dato gitt en formateringsstring. */ -export const formaterDato = (dato: string, formatString: string = NORSK_DATO_OG_TID_FORMAT_FULL) => { +export const formaterDato = (dato: Date | string, formatString: string = NORSK_DATO_OG_TID_FORMAT_FULL) => { try { if (dato === '-999999999-01-01') return ''; const formatertDato = format(dato, formatString, { locale: nb });