Skip to content

Commit

Permalink
Fjerne engelsk (#831)
Browse files Browse the repository at this point in the history
* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* UPDATE: Fjerne referanser til lang.ts

* FIX: Fjerne introdusert feil med datoformatering

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Fjerne referanse til lang.ts

* UPDATE: Oppdaterte test med å fjerne fnutter

* UPDATE: Fjerne referanser til intl.ts og rydde litt i filplassering

* UPDATE: Slette intl.ts og referanser

* UPDATE: Slette unødig fra lang.ts

* UPDATE: Slette unødig fra lang.ts

* UPDATE: Fjerne unødige filer og importer

* UPDATE: Fjerne unødige referanser til lang

* UPDATE: Rename lang.ts

* UPDATE: bruke tekster istedenfor kun prop-navn.
  • Loading branch information
PaulMartinKokseter authored May 31, 2024
1 parent ea51557 commit 17ab065
Show file tree
Hide file tree
Showing 138 changed files with 1,140 additions and 3,258 deletions.
2 changes: 1 addition & 1 deletion apps/frontend/public/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="no">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/AppRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Route, Routes, useNavigate, useLocation, useParams, Navigate } from 'react-router-dom'
import { Route, Routes, useLocation, useParams, Navigate } from 'react-router-dom'
import { Block } from 'baseui/block'
import { ParagraphLarge } from 'baseui/typography'
import { Spinner } from 'baseui/icon'
Expand All @@ -14,7 +14,7 @@ import ThirdPartyMetadataPage from './pages/ThirdPartyPage'
import { MainPage } from './pages/MainPage'
import CodelistPage from './pages/admin/CodelistPage'
import { AuditPage } from './pages/admin/AuditPage'
import { intl, theme } from './util'
import { theme } from './util'
import notFound from './resources/notfound.svg'
import { SettingsPage } from './pages/admin/SettingsPage'
import DocumentCreatePage from './pages/DocumentCreatePage'
Expand Down Expand Up @@ -111,9 +111,9 @@ const AppRoutes = (): JSX.Element => (
const NotFound = () => (
<Block display="flex" justifyContent="center" alignContent="center" marginTop={theme.sizing.scale4800}>
<ParagraphLarge>
{intl.pageNotFound} - {useLocation().pathname}
Oida 404! Fant ikke den siden der nei - {useLocation().pathname}
</ParagraphLarge>
<img src={notFound} alt={intl.pageNotFound} style={{ maxWidth: '65%' }} />
<img src={notFound} alt="404 Finner ikke den siden" style={{ maxWidth: '65%' }} />
</Block>
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Block } from 'baseui/block'
import React from 'react'
import { intl } from '../../util'
import { Cell, HeadCell, Row, Table } from '../common/Table'

type AAregHjemmelDataTextProps = {
Expand All @@ -17,12 +16,12 @@ export const AAregHjemmelDataText = (props: AAregHjemmelDataTextProps) => {
return (
<Block>
<Table
emptyText={intl.emptyMessage}
emptyText='Ikke angitt'
headers={
<>
<HeadCell title={intl.purposeForProcess} />
<HeadCell title={intl.authorityAndGroundsForDelivery} />
<HeadCell title={intl.consumerAuthorityForProcess} />
<HeadCell title='Formål med behandlingen' />
<HeadCell title='NAVs hjemmel for utlevering' />
<HeadCell title='Konsumentens hjemmel for behandlingen' />
</>
}
>
Expand Down
40 changes: 20 additions & 20 deletions apps/frontend/src/components/AaregAvtale/AaregAvtaleTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AaregAvtale } from '../../constants'
import { PLACEMENT, StatefulPopover } from 'baseui/popover'
import { StatefulMenu } from 'baseui/menu'
import { Block } from 'baseui/block'
import { intl, theme } from '../../util'
import { theme } from '../../util'
import Button from '../common/Button'
import { KIND } from 'baseui/button'
import { faChevronDown, faChevronRight } from '@fortawesome/free-solid-svg-icons'
Expand Down Expand Up @@ -63,7 +63,7 @@ export const AaregAvtaleTable = (props: AaregAvtaleTableProps) => {

return (
<>
<HeadingLarge>{intl.aaregContracts}</HeadingLarge>
<HeadingLarge>Utleveringsavtaler i Aa-registeret</HeadingLarge>
<StatelessAccordion
onChange={({ expanded }) => {
setSelectedAaregAvtale(expanded[0] as string)
Expand All @@ -82,7 +82,7 @@ export const AaregAvtaleTable = (props: AaregAvtaleTableProps) => {
{expanded ? <FontAwesomeIcon icon={faChevronDown} /> : <FontAwesomeIcon icon={faChevronRight} />}
<span> </span>
<span>
{a.virksomhet} - ({intl.aaregContractNumber}-{a.avtalenummer.replace('AVT-', '')})
{a.virksomhet} - (Avtalenummer-{a.avtalenummer.replace('AVT-', '')})
</span>
</LabelLarge>
</Block>
Expand All @@ -109,27 +109,27 @@ export const AaregAvtaleTable = (props: AaregAvtaleTableProps) => {
}}
>
<Block paddingBottom={theme.sizing.scale800} paddingLeft={theme.sizing.scale800} paddingRight={theme.sizing.scale800} paddingTop={theme.sizing.scale800}>
<CustomPanelLabel text={intl.consumer} />
<DataText label={intl.name} text={a.virksomhet || intl.emptyMessage} />
<DataText label={intl.organisationNumber} text={a.organisasjonsnummer || intl.emptyMessage} />
<CustomPanelLabel text='Konsument' />
<DataText label='Navn' text={a.virksomhet || 'Ikke angitt'} />
<DataText label='Organisasjonsnummer' text={a.organisasjonsnummer || 'Ikke angitt'} />

<CustomPanelLabel text={intl.contractAareg} />
<DataText label={intl.aaregContractNumber} text={a.avtalenummer || intl.emptyMessage} />
<DataText label={intl.createdDate} text={a.opprettet || intl.emptyMessage} />
<CustomPanelLabel text='Avtale' />
<DataText label='Avtalenummer' text={a.avtalenummer || 'Ikke angitt'} />
<DataText label='Dato opprettet' text={a.opprettet || 'Ikke angitt'} />

<CustomPanelLabel text={intl.purposeAuthorityLegalBasis} />
<CustomPanelLabel text='Formål, Hjemmel og Behandlingsgrunnlag' />

<AAregHjemmelDataText data={a.hjemmel_behandlingsgrunnlag_formal} />

<CustomPanelLabel text={intl.accessType} />
<DataText label={intl.API} text={a.integrert_oppslag_api ? intl.available : intl.unavailable} />
<DataText label={intl.extract} text={a.uttrekk ? intl.available : intl.unavailable} />
<DataText label={intl.webLookup} text={a.web_oppslag ? intl.available : intl.unavailable} />
<DataText label={intl.incidents} text={a.hendelser ? intl.available : intl.unavailable} />
<CustomPanelLabel text='Type tilgang' />
<DataText label='API' text={a.integrert_oppslag_api ? 'Tilgjengelig' : 'Ikke tilgjengelig'} />
<DataText label='Uttrekk' text={a.uttrekk ? 'Tilgjengelig' : 'Ikke tilgjengelig'} />
<DataText label='Web-oppslag' text={a.web_oppslag ? 'Tilgjengelig' : 'Ikke tilgjengelig'} />
<DataText label='Hendelser' text={a.hendelser ? 'Tilgjengelig' : 'Ikke tilgjengelig'} />

<CustomPanelLabel text={intl.processor} />
<DataText label={intl.organisationNumber} text={a.databehandler_organisasjonsnummer || intl.emptyMessage} />
<DataText label={intl.name} text={a.databehandler_navn || intl.emptyMessage} />
<CustomPanelLabel text='Databehandler' />
<DataText label='Organisasjonsnummer' text={a.databehandler_organisasjonsnummer || 'Ikke angitt'} />
<DataText label='Navn' text={a.databehandler_navn || 'Ikke angitt'} />
</Block>
</Block>
</Panel>
Expand All @@ -156,14 +156,14 @@ export const AaregAvtaleTable = (props: AaregAvtaleTableProps) => {
)}
>
<div>
<Button kind={KIND.tertiary} iconEnd={faChevronDown}>{`${pageLimit} ${intl.rows}`}</Button>
<Button kind={KIND.tertiary} iconEnd={faChevronDown}>{`${pageLimit} Rader`}</Button>
</div>
</StatefulPopover>
<Pagination
currentPage={page}
numPages={Math.ceil(props.aaregAvtaler.length / pageLimit)}
onPageChange={(a) => setPage(a.nextPage)}
labels={{ nextButton: intl.nextButton, preposition: intl.of, prevButton: intl.prevButton }}
labels={{ nextButton: 'Neste', preposition: 'av', prevButton: 'Forrige' }}
/>
</Block>
</>
Expand Down
33 changes: 0 additions & 33 deletions apps/frontend/src/components/App.tsx

This file was deleted.

43 changes: 0 additions & 43 deletions apps/frontend/src/components/Banner.tsx

This file was deleted.

6 changes: 3 additions & 3 deletions apps/frontend/src/components/Charts/Chart.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useReducer, useState } from 'react'
import { Block } from 'baseui/block'
import { intl, theme } from '../../util'
import { theme } from '../../util'
import { LabelLarge } from 'baseui/typography'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faChartBar, faChartPie, faCircle } from '@fortawesome/free-solid-svg-icons'
Expand Down Expand Up @@ -174,14 +174,14 @@ const Visualization = (props: VisualizationProps) => {
</Block>
</div>
))}
{noChartData && <Block $style={{ ...marginAll(theme.sizing.scale100) }}>{intl.emptyTable}</Block>}
{noChartData && <Block $style={{ ...marginAll(theme.sizing.scale100) }}>Ingen</Block>}
</Block>
</Block>
</div>
</Card>

<div onClick={toggle} style={{ position: 'absolute', top: '5px', left: '5px' }}>
<CustomizedStatefulTooltip content={type === 'bar' ? 'Kakediagram' : 'Søyledriagram'}>
<CustomizedStatefulTooltip content={type === 'bar' ? 'Kakediagram' : 'Søylediagram'}>
<Block $style={{ cursor: 'pointer' }}>
<FontAwesomeIcon icon={type === 'bar' ? faChartPie : faChartBar} />
</Block>
Expand Down
36 changes: 17 additions & 19 deletions apps/frontend/src/components/Charts/Charts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import { Block } from 'baseui/block'
import { cardShadow, chartCardProps } from '../common/Style'
import { AllDashCount, DepartmentDashCount, ProcessField, ProcessState, ProcessStatusFilter, ProductAreaDashCount } from '../../constants'
import TriChart from './TriChart'
import { intl } from '../../util'
import { Chart } from './Chart'
import { clickOnPieChartSlice } from '../../util/dashboard'
import { chartColor } from '../../util/theme'
import { ParagraphLarge, ParagraphMedium } from 'baseui/typography'
import RouteLink from '../common/RouteLink'
import { Section } from '../../pages/ProcessPage'
import { Card } from 'baseui/card'
import { lowerFirst } from 'lodash'

const chartSize = 80

Expand Down Expand Up @@ -45,16 +43,16 @@ const Charts = (props: ChartsProps) => {
return (
<Block display="flex" flexWrap={true} width={'100%'} justifyContent={'space-between'}>
<Block {...chartCardProps}>
<TriChart counter={chartData.dpia} title={intl.dpiaNeeded} processStatus={processStatus} processField={ProcessField.DPIA} onClickPieChartSlice={handleClickPieChartSlice} />
<TriChart counter={chartData.dpia} title='Behov for PVK' processStatus={processStatus} processField={ProcessField.DPIA} onClickPieChartSlice={handleClickPieChartSlice} />
<ParagraphMedium>
{intl.missingPVK}: <RouteLink href={link(ProcessField.DPIA_REFERENCE_MISSING, ProcessState.YES)}>{chartData.dpiaReferenceMissing}</RouteLink>
Ref. til PVK ikke angitt: <RouteLink href={link(ProcessField.DPIA_REFERENCE_MISSING, ProcessState.YES)}>{chartData.dpiaReferenceMissing}</RouteLink>
</ParagraphMedium>
</Block>

<Block {...chartCardProps}>
<TriChart
counter={chartData.profiling}
title={intl.profiling}
title='Profilering'
processStatus={processStatus}
processField={ProcessField.PROFILING}
onClickPieChartSlice={handleClickPieChartSlice}
Expand All @@ -64,7 +62,7 @@ const Charts = (props: ChartsProps) => {
<Block {...chartCardProps}>
<TriChart
counter={chartData.automation}
title={intl.automaticProcessing}
title='Helautomatisk behandling'
processStatus={processStatus}
processField={ProcessField.AUTOMATION}
onClickPieChartSlice={handleClickPieChartSlice}
Expand All @@ -73,25 +71,25 @@ const Charts = (props: ChartsProps) => {

<Block {...chartCardProps}>
<Chart
chartTitle={intl.incompleteLegalBasis}
chartTitle='Ufullstendig behandlingsgrunnlag'
size={chartSize}
hidePercent
type="bar"
data={[
{
label: intl.numberOfProcessesWithUnknownLegalBasis,
label: 'Rettslig grunnlag uavklart',
size: chartData.processesMissingLegalBases,
color: chartColor.generalRed,
onClick: handleClickPieChartSlice(ProcessField.MISSING_LEGAL_BASIS, ProcessState.YES, processStatus),
},
{
label: intl.numberOfProcessesWithoutArticle6LegalBasis,
label: 'Artikkel 6 mangler',
size: chartData.processesMissingArt6,
color: chartColor.generalMustard,
onClick: handleClickPieChartSlice(ProcessField.MISSING_ARTICLE_6, ProcessState.YES, processStatus),
},
{
label: intl.numberOfProcessesWithoutArticle9LegalBasis,
label: 'Artikkel 9 mangler',
size: chartData.processesMissingArt9,
color: chartColor.generalBlue,
onClick: handleClickPieChartSlice(ProcessField.MISSING_ARTICLE_9, ProcessState.YES, processStatus),
Expand All @@ -104,20 +102,20 @@ const Charts = (props: ChartsProps) => {
<TriChart
counter={chartData.retention}
processStatus={processStatus}
title={intl.retentionPieChartTitle}
title='Omfattes av NAVs bevarings- og kassasjonsvedtak'
processField={ProcessField.RETENTION}
onClickPieChartSlice={handleClickPieChartSlice}
/>
<ParagraphLarge>
{intl.processWithIncompleteRetention} <RouteLink href={link(ProcessField.RETENTION_DATA)}>{chartData.retentionDataIncomplete}</RouteLink>
Behandlinger med ufullstendig lagringstid: <RouteLink href={link(ProcessField.RETENTION_DATA)}>{chartData.retentionDataIncomplete}</RouteLink>
</ParagraphLarge>
</Block>

<Block {...chartCardProps}>
<TriChart
counter={chartData.dataProcessor}
processStatus={processStatus}
title={intl.isProcessorUsed}
title='Benyttes databehandler(e)?'
processField={ProcessField.DATA_PROCESSOR}
onClickPieChartSlice={handleClickPieChartSlice}
/>
Expand All @@ -126,16 +124,16 @@ const Charts = (props: ChartsProps) => {
{all.disclosures !== undefined && (
<Block {...chartCardProps}>
<Chart
chartTitle={intl.disclosures + ' ' + lowerFirst(intl.legalBasesShort)}
chartTitle='Utleveringer behandlingsgrunnlag'
data={[
{
label: intl.filled,
label: 'Utfylt',
size: all.disclosures - all.disclosuresIncomplete,
color: chartColor.generalBlue,
onClick: () => navigate('/disclosure?filter=legalbases'),
},
{
label: intl.incomplete,
label: 'Ufullstendig',
size: all.disclosuresIncomplete,
color: chartColor.generalRed,
onClick: () => navigate('/disclosure?filter=emptylegalbases'),
Expand All @@ -144,7 +142,7 @@ const Charts = (props: ChartsProps) => {
size={chartSize}
/>
<ParagraphMedium>
{intl.disclosures}: <RouteLink href={'/disclosure'}>{all.disclosures}</RouteLink>
Utleveringer: <RouteLink href={'/disclosure'}>{all.disclosures}</RouteLink>
</ParagraphMedium>
</Block>
)}
Expand All @@ -153,10 +151,10 @@ const Charts = (props: ChartsProps) => {
<Card overrides={cardShadow}>
<Block>
<ParagraphMedium>
{intl.navResponsible}: <RouteLink href={link(ProcessField.COMMON_EXTERNAL_PROCESSOR, ProcessState.YES)}>{chartData.commonExternalProcessResponsible}</RouteLink>
Behandlinger hvor NAV er felles behandlingsansvarlig med ekstern part: <RouteLink href={link(ProcessField.COMMON_EXTERNAL_PROCESSOR, ProcessState.YES)}>{chartData.commonExternalProcessResponsible}</RouteLink>
</ParagraphMedium>
<ParagraphMedium>
{intl.dpProcessPageTitle}: <RouteLink href={'/dpprocess'}>{chartData.dpProcesses}</RouteLink>
Behandlinger hvor NAV er databehandler: <RouteLink href={'/dpprocess'}>{chartData.dpProcesses}</RouteLink>
</ParagraphMedium>
</Block>
</Card>
Expand Down
Loading

0 comments on commit 17ab065

Please sign in to comment.