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

Commit

Permalink
Intl 2 > 3
Browse files Browse the repository at this point in the history
  • Loading branch information
igorweber committed Nov 20, 2023
1 parent 07f1039 commit c0da47a
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 210 deletions.
225 changes: 57 additions & 168 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"@types/react-aria-menubutton": "^6.2.12",
"@types/react-collapse": "^5.0.4",
"@types/react-dom": "^17.0.23",
"@types/react-intl": "^2.3.18",
"@types/react-intl-redux": "^0.1.19",
"@types/react-redux": "^7.1.30",
"@types/react-router": "^5.1.20",
Expand Down Expand Up @@ -81,7 +80,7 @@
"react-burger-menu": "^3.0.9",
"react-collapse": "^5.1.1",
"react-dom": "^17.0.2",
"react-intl": "^2.9.0",
"react-intl": "^3.12.1",
"react-intl-redux": "^2.3.0",
"react-modal": "^3.16.1",
"react-motion": "^0.5.2",
Expand Down Expand Up @@ -162,6 +161,9 @@
],
"snapshotSerializers": [
"enzyme-to-json/serializer"
],
"transformIgnorePatterns": [
"/node_modules/(?!intl-messageformat|intl-messageformat-parser).+\\.js$"
]
},
"husky": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ exports[`NavKnapp 1`] = `
onClick={[Function]}
type="submit"
>
<span>
Neste
</span>
Neste
</button>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ exports[`PeriodeBanner 1`] = `
<p
className="typo-ingress flex-innhold sentrert"
>
<span>
Meldekort for perioden
</span>
Meldekort for perioden
</p>
<h1
className="typo-innholdstittel flex-innhold sentrert"
Expand Down
6 changes: 2 additions & 4 deletions src/__test__/utils/sporsmalsobjekterUtil.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ import { Skrivemodus } from "../../app/types/skrivemodus";
import { MeldekortdetaljerState } from "../../app/reducers/meldekortdetaljerReducer";
import { PersonInfoState } from "../../app/reducers/personInfoReducer";
import { IntlState } from "react-intl-redux";
import { Locale, Locales } from "../../app/reducers/localesReducer";
import { Locale } from "../../app/reducers/localesReducer";
import NorskFlaggSVG from "../../app/components/sprakvelger/NorskFlaggSVG";
import localeDataNB from "react-intl/locale-data/nb";
import * as React from "react";

const MELDEKORT_ID = 1234567;
Expand All @@ -49,10 +48,9 @@ const locale: Locale = {
label: 'nb',
tittel: 'Norsk',
ikon: <NorskFlaggSVG />,
localeData: localeDataNB,
}

const locales: Locales = [locale]
const locales: Locale[] = [locale]

const intl: IntlState = {
locale: 'nb',
Expand Down
Loading

0 comments on commit c0da47a

Please sign in to comment.