Skip to content

Commit a0f6375

Browse files
committed
send med språk
1 parent da06314 commit a0f6375

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

src/components/_common/office-details/OfficeDetails.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { classNames } from 'utils/classnames';
33
import { translator } from 'translations';
44
import { Reception } from './reception/Reception';
55
import { OfficeDetailsData } from 'types/content-props/office-details-props';
6-
import { usePageConfig } from 'store/hooks/usePageConfig';
76
import { PhonePoster } from './phonePoster/PhonePoster';
87
import { OfficeInformation } from './officeInformation/OfficeInformation';
98
import { forceArray } from 'utils/arrays';
@@ -15,7 +14,7 @@ export interface OfficeDetailsProps {
1514
}
1615

1716
export const OfficeDetails = ({ officeData }: OfficeDetailsProps) => {
18-
const { language } = usePageConfig();
17+
const language = 'no'; //Kontorsidene er per nå kun på bokmål
1918
const { brukerkontakt } = officeData;
2019
const getOfficeTranslations = translator('office', language);
2120

@@ -30,7 +29,7 @@ export const OfficeDetails = ({ officeData }: OfficeDetailsProps) => {
3029
{getOfficeTranslations('youFindUsHere')}
3130
</Heading>
3231
{publikumsmottak.length > 0 && (
33-
<Reception receptions={publikumsmottak} />
32+
<Reception receptions={publikumsmottak} language={'no'} />
3433
)}
3534
<PhonePoster officeData={officeData} />
3635
<OfficeInformation officeData={officeData} />

src/components/_common/office-details/reception/OpeningHours.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import React from 'react';
2-
import { usePageConfig } from 'store/hooks/usePageConfig';
32
import { translator } from 'translations';
43
import { formatDate } from 'utils/datetime';
5-
import { OpeningHours as OpeningHoursProps } from './utils/types';
4+
import { Language, OpeningHours as OpeningHoursProps } from './utils/types';
65
import { Table } from '@navikt/ds-react';
76

87
import styles from './OpeningHours.module.scss';
98

109
type Props = {
1110
openingHours: OpeningHoursProps[];
11+
language: Language;
1212
};
1313

14-
export const OpeningHours = ({ openingHours }: Props) => {
15-
const { language } = usePageConfig();
14+
export const OpeningHours = ({ openingHours, language }: Props) => {
1615
const getOfficeTranslations = translator('office', language);
1716
const getDateTimeTranslations = translator('dateTime', language);
1817

src/components/_common/office-details/reception/Reception.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import React, { useState } from 'react';
22
import { BodyLong, Tabs } from '@navikt/ds-react';
3-
import { AudienceReception } from './utils/types';
3+
import { AudienceReception, Language } from './utils/types';
44

55
import { SingleReception } from './SingleReception';
66
import { translator } from 'translations';
7-
import { usePageConfig } from 'store/hooks/usePageConfig';
87

98
import styles from './Reception.module.scss';
109
import { forceArray } from 'utils/arrays';
1110

1211
interface LocationsProps {
1312
receptions: AudienceReception[] | AudienceReception;
13+
language: Language;
1414
}
1515

16-
export const Reception = ({ receptions }: LocationsProps) => {
17-
const { language } = usePageConfig();
16+
export const Reception = ({ receptions, language }: LocationsProps) => {
1817
const receptionArray = forceArray(receptions);
1918
const getOfficeTranslations = translator('office', language);
2019

src/components/_common/office-details/reception/SingleReception.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
HouseFillIcon,
66
} from '@navikt/aksel-icons';
77
import { classNames } from 'utils/classnames';
8-
import { usePageConfig } from 'store/hooks/usePageConfig';
98
import { translator } from 'translations';
109
import {
1110
AudienceReception,
11+
Language,
1212
OpeningHours as OpeningHoursProps,
1313
} from './utils/types';
1414
import { formatAddress } from '../utils';
@@ -24,9 +24,10 @@ interface FormattedAudienceReception {
2424
place: string;
2525
}
2626

27-
export const SingleReception = (props: AudienceReception) => {
28-
const { language } = usePageConfig();
29-
27+
export const SingleReception = (
28+
props: AudienceReception,
29+
language: Language
30+
) => {
3031
const getLabel = translator('office', language);
3132

3233
const dagArr: string[] = [
@@ -124,15 +125,21 @@ export const SingleReception = (props: AudienceReception) => {
124125
/>
125126
{getLabel('openingHoursWithoutAppointment')}
126127
</Heading>
127-
<OpeningHours openingHours={openingHours} />
128+
<OpeningHours
129+
openingHours={openingHours}
130+
language={language}
131+
/>
128132
</>
129133
)}
130134
{futureOpeningHoursExceptions.length > 0 && (
131135
<>
132136
<Heading level="3" size="medium" spacing>
133137
{getLabel('specialOpeningHours')}
134138
</Heading>
135-
<OpeningHours openingHours={futureOpeningHoursExceptions} />
139+
<OpeningHours
140+
openingHours={futureOpeningHoursExceptions}
141+
language={language}
142+
/>
136143
</>
137144
)}
138145
<div className={styles.appointmentBookingInfo}>

src/components/_common/office-details/reception/utils/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ export interface AudienceReception {
2525
besoeksadresse?: Address;
2626
adkomstbeskrivelse?: string;
2727
}
28+
29+
export type Language = 'no' | 'nn' | 'en';

0 commit comments

Comments
 (0)