From 73b8e6d5b2c447f6cbb6929c3e92a13a523a11e2 Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 10:34:21 +0200 Subject: [PATCH 1/7] =?UTF-8?q?flytt=20oversettelser=20tilsvarende=20rekke?= =?UTF-8?q?f=C3=B8lge=20som=20i=20default.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/translations/en.ts | 77 ++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/src/translations/en.ts b/src/translations/en.ts index 78e915dd3..f849a81b3 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -59,16 +59,13 @@ export const translationsBundleEn: PartialTranslations = { for: 'for', this: 'this', }, - dates: { - published: 'Published', - lastChanged: 'Updated', - }, calculator: { calculate: 'Calculate', error: 'Sorry, an error has occurred in the calculator with the following error message:', }, - linkLists: { - moreNews: 'More news', + dates: { + published: 'Published', + lastChanged: 'Updated', }, linkList: { label: 'List of links', @@ -79,6 +76,30 @@ export const translationsBundleEn: PartialTranslations = { customizeContent: 'Customize content', showingInformationFor: 'Showing information for:', }, + pressLanding: { + latestPressNews: 'Latest press and news', + morePressNews: 'More press releases and news', + pressShortcuts: 'Shortcuts', + news: 'News', + press: 'Press release', + published: 'Published', + }, + linkLists: { + moreNews: 'More news', + }, + currentTopic: { + tag: 'Featured', + }, + mainArticle: { + facts: 'Facts', + tableOfContents: 'Table of contents', + contents: 'Contents', + news: 'News', + pressRelease: 'Press release', + }, + mainPanels: { + label: 'Main panels', + }, audienceServices: { HJELP_KOMME_I_JOBB: 'Employment help', NODSITUASJON: @@ -108,25 +129,21 @@ export const translationsBundleEn: PartialTranslations = { STOTTEKONTAKT: 'Støttekontakt', TILRETTELAGT_TRANSPORT: 'Arranged transport (TT card)', }, - currentTopic: { - tag: 'Featured', + products: { + person: 'For individuals', + employer: 'For employers', + provider: 'For providers', }, - pressLanding: { - latestPressNews: 'Latest press and news', - morePressNews: 'More press releases and news', - pressShortcuts: 'Shortcuts', - news: 'News', - press: 'Press release', - published: 'Published', + situations: { + person: 'Your rights', + employer: 'What employers should know', + provider: 'For providers', }, - mainArticle: { - facts: 'Facts', - tableOfContents: 'Table of contents', - contents: 'Contents', - news: 'News', - pressRelease: 'Press release', + guides: { + person: 'How to', + employer: 'For employers', + provider: 'For providers', }, - mainPanels: { label: 'Main panels' }, publishingCalendar: { publishdate: 'Date', event: 'Publication', @@ -165,6 +182,7 @@ export const translationsBundleEn: PartialTranslations = { date: 'date', }, relatedContent: { + //TODO flytt? [MenuListItemKey.AppealRights]: 'Appeal rights', [MenuListItemKey.FormAndApplication]: 'Form and application', [MenuListItemKey.International]: 'International', @@ -178,21 +196,6 @@ export const translationsBundleEn: PartialTranslations = { [MenuListItemKey.Selfservice]: 'Selfservice', [MenuListItemKey.Shortcuts]: 'Shortcuts', }, - products: { - person: 'For individuals', - employer: 'For employers', - provider: 'For providers', - }, - situations: { - person: 'Your rights', - employer: 'What employers should know', - provider: 'For providers', - }, - guides: { - person: 'How to', - employer: 'For employers', - provider: 'For providers', - }, taxonomies, areas, header: { From e423934af07c387e768f97cc9acaca7376ea5d79 Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 10:51:09 +0200 Subject: [PATCH 2/7] =?UTF-8?q?flere=20endringer=20i=20rekkef=C3=B8lge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/translations/default.ts | 2 +- src/translations/en.ts | 98 ++++++++++++++++++------------------- src/translations/nn.ts | 48 +++++++++--------- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/translations/default.ts b/src/translations/default.ts index b24fc3e60..009bdf757 100644 --- a/src/translations/default.ts +++ b/src/translations/default.ts @@ -312,7 +312,7 @@ export const translationsBundleNb = { months: 'måneder', }, }, - productDetailTypes, + productDetailTypes, //TODO dette og andre ting duplisert? sjekk processingTimesVisibilityTypes, payoutDates: { tableHeaderPrefix: 'Utbetalingsdatoer i', diff --git a/src/translations/en.ts b/src/translations/en.ts index f849a81b3..deb03ceae 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -148,55 +148,7 @@ export const translationsBundleEn: PartialTranslations = { publishdate: 'Date', event: 'Publication', }, - office: { - youFindUsHere: 'You can find us here', - officeInformation: 'Office information', - location: 'Location', - postalAddress: 'Postal address', - orgNumber: 'Org number', - officeNumber: 'Office number', - phoneToNav: 'NAV phone number is', - phoneToHMS: 'Phone number to Hjelpemiddelsentralen is', - phoneInformation: - 'Phone hours, weekdays at 9-15. NAV call center will assist you or connect you with your NAV office.', - alternativeContacts: 'Other contact options:', - taglineOffice: 'NAV office', - taglineHMS: 'Assistive technology centre', - }, - dateTime: { - weekDayNames: { - mon: 'Monday', - tue: 'Tuesday', - wed: 'Wednesday', - thu: 'Thursday', - fri: 'Friday', - sat: 'Saturday', - sun: 'Sunday', - }, - relatives: { - today: 'today', - tomorrow: 'tomorrow', - }, - time: 'time', - day: 'day', - date: 'date', - }, - relatedContent: { - //TODO flytt? - [MenuListItemKey.AppealRights]: 'Appeal rights', - [MenuListItemKey.FormAndApplication]: 'Form and application', - [MenuListItemKey.International]: 'International', - [MenuListItemKey.Membership]: 'Membership', - [MenuListItemKey.ProcessTimes]: 'Processing times', - [MenuListItemKey.Rates]: 'Rates', - [MenuListItemKey.RelatedInformation]: 'Related information', - [MenuListItemKey.ReportChanges]: 'Report changes', - [MenuListItemKey.RulesAndRegulations]: 'Laws and regulations', - [MenuListItemKey.Saksbehandling]: 'Procedural', - [MenuListItemKey.Selfservice]: 'Selfservice', - [MenuListItemKey.Shortcuts]: 'Shortcuts', - }, - taxonomies, + taxonomies, //TODO sjekk inkonsistens med default.ts areas, header: { copyLink: 'Copy link', @@ -265,11 +217,59 @@ export const translationsBundleEn: PartialTranslations = { seeMoreOptions: 'See more phone numbers and calling options', }, }, + office: { + youFindUsHere: 'You can find us here', + officeInformation: 'Office information', + location: 'Location', + postalAddress: 'Postal address', + orgNumber: 'Org number', + officeNumber: 'Office number', + phoneToNav: 'NAV phone number is', + phoneToHMS: 'Phone number to Hjelpemiddelsentralen is', + phoneInformation: + 'Phone hours, weekdays at 9-15. NAV call center will assist you or connect you with your NAV office.', + alternativeContacts: 'Other contact options:', + taglineOffice: 'NAV office', + taglineHMS: 'Assistive technology centre', + }, + dateTime: { + weekDayNames: { + mon: 'Monday', + tue: 'Tuesday', + wed: 'Wednesday', + thu: 'Thursday', + fri: 'Friday', + sat: 'Saturday', + sun: 'Sunday', + }, + relatives: { + today: 'today', + tomorrow: 'tomorrow', + }, + time: 'time', + day: 'day', + date: 'date', + }, pageWarnings: { draftWarning: 'Draft - this page is still in progress', failoverWarning: 'We are currently having technical issues on nav.no. You may experience slow response times or missing content. Try reloading the page.', }, + relatedContent: { + //TODO flytt? + [MenuListItemKey.AppealRights]: 'Appeal rights', + [MenuListItemKey.FormAndApplication]: 'Form and application', + [MenuListItemKey.International]: 'International', + [MenuListItemKey.Membership]: 'Membership', + [MenuListItemKey.ProcessTimes]: 'Processing times', + [MenuListItemKey.Rates]: 'Rates', + [MenuListItemKey.RelatedInformation]: 'Related information', + [MenuListItemKey.ReportChanges]: 'Report changes', + [MenuListItemKey.RulesAndRegulations]: 'Laws and regulations', + [MenuListItemKey.Saksbehandling]: 'Procedural', + [MenuListItemKey.Selfservice]: 'Selfservice', + [MenuListItemKey.Shortcuts]: 'Shortcuts', + }, caseTimeUnit: { single: { days: 'day', diff --git a/src/translations/nn.ts b/src/translations/nn.ts index 3bca515f3..18acc580d 100644 --- a/src/translations/nn.ts +++ b/src/translations/nn.ts @@ -86,6 +86,14 @@ export const translationsBundleNn: PartialTranslations = { customizeContent: 'Tilpass innhald', showingInformationFor: 'Viser informasjon for:', }, + pressLanding: { + latestPressNews: 'Siste pressemeldingar og nyheiter', + morePressNews: 'Fleire pressemeldingar og nyheiter', + pressShortcuts: 'Snarvegar', + news: 'Nyheit', + press: 'Pressemelding', + published: 'Publisert', + }, linkLists: { moreNews: 'Fleire nyheiter', }, @@ -161,21 +169,6 @@ export const translationsBundleNn: PartialTranslations = { copyLinkTo: 'Kopier lenke til', copiedLinkConfirmed: 'Lenka er kopiert', }, - office: { - youFindUsHere: 'Du finn oss her', - officeInformation: 'Kontorinformasjon', - location: 'Plassering', - postalAddress: 'Postadresse', - orgNumber: 'Organisasjonsnummer', - officeNumber: 'Kontornummer', - phoneToNav: 'Telefonnummeret til NAV er', - phoneToHMS: 'Telefonnummeret til Hjelpemiddelsentralen er', - phoneInformation: - 'Telefontid kvardagar kl 9–15. NAV Kontaktsenter kan hjelpe deg, eller sette deg i kontakt med NAV-kontoret ditt.', - alternativeContacts: 'Andre kontaktopplysningar:', - taglineOffice: 'NAV-kontor', - taglineHMS: 'Hjelpemiddelsentral', - }, overview: { noHits: 'Ingen treff med dei valde filtera.', numHits: 'Viser $1 av $2', @@ -196,16 +189,8 @@ export const translationsBundleNn: PartialTranslations = { ariaItemExplanation: 'Vis type', }, }, - pressLanding: { - latestPressNews: 'Siste pressemeldingar og nyheiter', - morePressNews: 'Fleire pressemeldingar og nyheiter', - pressShortcuts: 'Snarvegar', - news: 'Nyheit', - press: 'Pressemelding', - published: 'Publisert', - }, form: { - back: 'Tilbake', + back: 'Tilbake', //TODO samme som bokmål, slett? }, contactPoint: { chat: { @@ -245,6 +230,21 @@ export const translationsBundleNn: PartialTranslations = { seeMoreOptions: 'Sjå fleire telefonnummer og tasteval.', }, }, + office: { + youFindUsHere: 'Du finn oss her', + officeInformation: 'Kontorinformasjon', + location: 'Plassering', + postalAddress: 'Postadresse', + orgNumber: 'Organisasjonsnummer', + officeNumber: 'Kontornummer', + phoneToNav: 'Telefonnummeret til NAV er', + phoneToHMS: 'Telefonnummeret til Hjelpemiddelsentralen er', + phoneInformation: + 'Telefontid kvardagar kl 9–15. NAV Kontaktsenter kan hjelpe deg, eller sette deg i kontakt med NAV-kontoret ditt.', + alternativeContacts: 'Andre kontaktopplysningar:', + taglineOffice: 'NAV-kontor', + taglineHMS: 'Hjelpemiddelsentral', + }, dateTime: { weekDayNames: { mon: 'Måndag', From b85905a86219aaa1b6df0b576cc93e66f49a0bfa Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 11:29:08 +0200 Subject: [PATCH 3/7] flytt relatedContent til samme sted, har testet at det funker --- src/translations/en.ts | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/translations/en.ts b/src/translations/en.ts index deb03ceae..5a2014979 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -12,6 +12,21 @@ import { } from 'types/content-props/product-details'; import { PartialTranslations } from './default'; +const relatedContent: { [key in MenuListItemKey]: string } = { + [MenuListItemKey.AppealRights]: 'Appeal rights', + [MenuListItemKey.FormAndApplication]: 'Form and application', + [MenuListItemKey.International]: 'International', + [MenuListItemKey.Membership]: 'Membership', + [MenuListItemKey.ProcessTimes]: 'Processing times', + [MenuListItemKey.Rates]: 'Rates', + [MenuListItemKey.RelatedInformation]: 'Related information', + [MenuListItemKey.ReportChanges]: 'Report changes', + [MenuListItemKey.RulesAndRegulations]: 'Laws and regulations', + [MenuListItemKey.Saksbehandling]: 'Procedural', + [MenuListItemKey.Selfservice]: 'Selfservice', + [MenuListItemKey.Shortcuts]: 'Shortcuts', +}; + const taxonomies: { [key in Taxonomy]?: string; } = { @@ -129,6 +144,7 @@ export const translationsBundleEn: PartialTranslations = { STOTTEKONTAKT: 'Støttekontakt', TILRETTELAGT_TRANSPORT: 'Arranged transport (TT card)', }, + relatedContent, products: { person: 'For individuals', employer: 'For employers', @@ -255,21 +271,6 @@ export const translationsBundleEn: PartialTranslations = { failoverWarning: 'We are currently having technical issues on nav.no. You may experience slow response times or missing content. Try reloading the page.', }, - relatedContent: { - //TODO flytt? - [MenuListItemKey.AppealRights]: 'Appeal rights', - [MenuListItemKey.FormAndApplication]: 'Form and application', - [MenuListItemKey.International]: 'International', - [MenuListItemKey.Membership]: 'Membership', - [MenuListItemKey.ProcessTimes]: 'Processing times', - [MenuListItemKey.Rates]: 'Rates', - [MenuListItemKey.RelatedInformation]: 'Related information', - [MenuListItemKey.ReportChanges]: 'Report changes', - [MenuListItemKey.RulesAndRegulations]: 'Laws and regulations', - [MenuListItemKey.Saksbehandling]: 'Procedural', - [MenuListItemKey.Selfservice]: 'Selfservice', - [MenuListItemKey.Shortcuts]: 'Shortcuts', - }, caseTimeUnit: { single: { days: 'day', @@ -283,6 +284,7 @@ export const translationsBundleEn: PartialTranslations = { }, }, productDetailTypes: { + //TODO sjekk inkonsistens med bokmål og nynorsk [ProductDetailType.PAYOUT_DATES]: 'payment dates', [ProductDetailType.PROCESSING_TIMES]: 'processing times', [ProductDetailType.RATES]: 'rates', From 132d4b3d1f00edbca42f381102f5590e9f77ad77 Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 11:34:10 +0200 Subject: [PATCH 4/7] Refactor translations to match order in default.ts --- src/translations/default.ts | 10 +++++----- src/translations/en.ts | 6 +++--- src/translations/nn.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/translations/default.ts b/src/translations/default.ts index 009bdf757..10b0702b2 100644 --- a/src/translations/default.ts +++ b/src/translations/default.ts @@ -81,6 +81,11 @@ const processingTimesVisibilityTypes: { [key in ProcessingTimesVisibilityType]: }; export const translationsBundleNb = { + relatedContent, + taxonomies, + areas, + productDetailTypes, + processingTimesVisibilityTypes, localeNames: { no: 'norsk (bokmål)', nn: 'nynorsk', @@ -165,9 +170,6 @@ export const translationsBundleNb = { STOTTEKONTAKT: 'Støttekontakt', TILRETTELAGT_TRANSPORT: 'Tilrettelagt transport (TT-kort)', }, - relatedContent, - taxonomies, - areas, products: { person: 'For privatpersoner', employer: 'For arbeidsgivere', @@ -312,8 +314,6 @@ export const translationsBundleNb = { months: 'måneder', }, }, - productDetailTypes, //TODO dette og andre ting duplisert? sjekk - processingTimesVisibilityTypes, payoutDates: { tableHeaderPrefix: 'Utbetalingsdatoer i', tableHeaderPrefixNoYear: 'Utbetalingsdatoer', diff --git a/src/translations/en.ts b/src/translations/en.ts index 5a2014979..efc22d8b4 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -69,6 +69,9 @@ const areas: { [key in Area]?: string } = { }; export const translationsBundleEn: PartialTranslations = { + relatedContent, + taxonomies, + areas, stringParts: { conjunction: 'and', for: 'for', @@ -144,7 +147,6 @@ export const translationsBundleEn: PartialTranslations = { STOTTEKONTAKT: 'Støttekontakt', TILRETTELAGT_TRANSPORT: 'Arranged transport (TT card)', }, - relatedContent, products: { person: 'For individuals', employer: 'For employers', @@ -164,8 +166,6 @@ export const translationsBundleEn: PartialTranslations = { publishdate: 'Date', event: 'Publication', }, - taxonomies, //TODO sjekk inkonsistens med default.ts - areas, header: { copyLink: 'Copy link', copyLinkTo: 'Copy link to', diff --git a/src/translations/nn.ts b/src/translations/nn.ts index 18acc580d..8190ebde4 100644 --- a/src/translations/nn.ts +++ b/src/translations/nn.ts @@ -64,6 +64,9 @@ const areas: { [key in Area]?: string } = { }; export const translationsBundleNn: PartialTranslations = { + relatedContent, + taxonomies, + areas, stringParts: { conjunction: 'og', for: 'for', @@ -142,9 +145,6 @@ export const translationsBundleNn: PartialTranslations = { STOTTEKONTAKT: 'Støttekontakt', TILRETTELAGT_TRANSPORT: 'Tilrettelagt transport (TT-kort)', }, - relatedContent, - taxonomies, - areas, products: { person: 'For privatpersonar', employer: 'For arbeidsgjevarar', From 3635b0a5cdf2128368567d336d83a8fe78be3b2d Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 11:39:58 +0200 Subject: [PATCH 5/7] flytt productDetailTypes og processingTimesVisibilityTypes i en.ts --- src/translations/en.ts | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/translations/en.ts b/src/translations/en.ts index efc22d8b4..3f4ed0f33 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -68,10 +68,24 @@ const areas: { [key in Area]?: string } = { [Area.OTHER]: 'General', }; +const productDetailTypes: { [key in ProductDetailType]: string } = { + [ProductDetailType.PAYOUT_DATES]: 'payment dates', + [ProductDetailType.PROCESSING_TIMES]: 'processing times', + [ProductDetailType.RATES]: 'rates', + [ProductDetailType.ALL_PRODUCTS]: 'all', +}; +const processingTimesVisibilityTypes: { [key in ProcessingTimesVisibilityType]: string } = { + [ProcessingTimesVisibilityType.ALL]: '', + [ProcessingTimesVisibilityType.APPLICATION]: 'application', + [ProcessingTimesVisibilityType.COMPLAINT]: 'appeal', +}; + export const translationsBundleEn: PartialTranslations = { relatedContent, taxonomies, areas, + productDetailTypes, + processingTimesVisibilityTypes, stringParts: { conjunction: 'and', for: 'for', @@ -283,18 +297,6 @@ export const translationsBundleEn: PartialTranslations = { months: 'months', }, }, - productDetailTypes: { - //TODO sjekk inkonsistens med bokmål og nynorsk - [ProductDetailType.PAYOUT_DATES]: 'payment dates', - [ProductDetailType.PROCESSING_TIMES]: 'processing times', - [ProductDetailType.RATES]: 'rates', - [ProductDetailType.ALL_PRODUCTS]: 'all', - }, - processingTimesVisibilityTypes: { - [ProcessingTimesVisibilityType.ALL]: '', - [ProcessingTimesVisibilityType.APPLICATION]: 'application', - [ProcessingTimesVisibilityType.COMPLAINT]: 'appeal', - }, payoutDates: { tableHeaderPrefix: 'Payment dates in', tableHeaderPrefixNoYear: 'Payment dates', From 39650a880dd3bd14b26a3891907dc05683f8f8ca Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 11:44:38 +0200 Subject: [PATCH 6/7] fjern kommentar --- src/translations/nn.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/nn.ts b/src/translations/nn.ts index 8190ebde4..110e15b55 100644 --- a/src/translations/nn.ts +++ b/src/translations/nn.ts @@ -190,7 +190,7 @@ export const translationsBundleNn: PartialTranslations = { }, }, form: { - back: 'Tilbake', //TODO samme som bokmål, slett? + back: 'Tilbake', }, contactPoint: { chat: { From 49a4f2e756db0f0d5a51d0c4766bf56fa10c3787 Mon Sep 17 00:00:00 2001 From: bdahle Date: Thu, 18 Jul 2024 11:49:06 +0200 Subject: [PATCH 7/7] =?UTF-8?q?rekkef=C3=B8lge=20i=20office?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/translations/en.ts | 2 +- src/translations/nn.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/translations/en.ts b/src/translations/en.ts index 3f4ed0f33..fff3b08a9 100644 --- a/src/translations/en.ts +++ b/src/translations/en.ts @@ -191,8 +191,8 @@ export const translationsBundleEn: PartialTranslations = { search: 'Search', filterOrSearch: 'Use filters or search', loading: 'Loading content...', - any: 'From A to Z', resetFilters: 'Reset filters', + any: 'From A to Z', more: 'More about', areas: { choose: 'Choose area', diff --git a/src/translations/nn.ts b/src/translations/nn.ts index 110e15b55..9499e7162 100644 --- a/src/translations/nn.ts +++ b/src/translations/nn.ts @@ -175,9 +175,9 @@ export const translationsBundleNn: PartialTranslations = { search: 'Søk', filterOrSearch: 'Bruk filter eller søk', loading: 'Laster innhald...', + resetFilters: 'Nullstill filter', any: 'Frå A til Å', more: 'Meir om', - resetFilters: 'Nullstill filter', areas: { choose: 'Vel område', ariaExplanation: 'Filtrer lista etter område',