Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Konsistent rekkefølge i språkfiler #1969

Merged
merged 9 commits into from
Jul 18, 2024
Merged

Konsistent rekkefølge i språkfiler #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
73b8e6d
flytt oversettelser tilsvarende rekkefølge som i default.ts
bdahle Jul 18, 2024
e423934
flere endringer i rekkefølge
bdahle Jul 18, 2024
b85905a
flytt relatedContent til samme sted, har testet at det funker
bdahle Jul 18, 2024
132d4b3
Refactor translations to match order in default.ts
bdahle Jul 18, 2024
3635b0a
flytt productDetailTypes og processingTimesVisibilityTypes i en.ts
bdahle Jul 18, 2024
b7713b9
Merge pull request #1970 from navikt/languages-3
bdahle Jul 18, 2024
39650a8
fjern kommentar
bdahle Jul 18, 2024
49a4f2e
rekkefølge i office
bdahle Jul 18, 2024
80f150f
Merge branch 'master' into languages-2
terjeofnorway Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/translations/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ const processingTimesVisibilityTypes: { [key in ProcessingTimesVisibilityType]:
};

export const translationsBundleNb = {
relatedContent,
taxonomies,
areas,
productDetailTypes,
processingTimesVisibilityTypes,
localeNames: {
no: 'norsk (bokmål)',
nn: 'nynorsk',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -312,8 +314,6 @@ export const translationsBundleNb = {
months: 'måneder',
},
},
productDetailTypes,
processingTimesVisibilityTypes,
payoutDates: {
tableHeaderPrefix: 'Utbetalingsdatoer i',
tableHeaderPrefixNoYear: 'Utbetalingsdatoer',
Expand Down
187 changes: 97 additions & 90 deletions src/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
} = {
Expand Down Expand Up @@ -53,22 +68,36 @@ 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',
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',
Expand All @@ -79,6 +108,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:
Expand Down Expand Up @@ -108,76 +161,6 @@ export const translationsBundleEn: PartialTranslations = {
STOTTEKONTAKT: 'Støttekontakt',
TILRETTELAGT_TRANSPORT: 'Arranged transport (TT card)',
},
currentTopic: {
tag: 'Featured',
},
pressLanding: {
latestPressNews: 'Latest press and news',
morePressNews: 'More press releases and news',
pressShortcuts: 'Shortcuts',
news: 'News',
press: 'Press release',
published: 'Published',
},
mainArticle: {
facts: 'Facts',
tableOfContents: 'Table of contents',
contents: 'Contents',
news: 'News',
pressRelease: 'Press release',
},
mainPanels: { label: 'Main panels' },
publishingCalendar: {
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: {
[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',
},
products: {
person: 'For individuals',
employer: 'For employers',
Expand All @@ -193,8 +176,10 @@ export const translationsBundleEn: PartialTranslations = {
employer: 'For employers',
provider: 'For providers',
},
taxonomies,
areas,
publishingCalendar: {
publishdate: 'Date',
event: 'Publication',
},
header: {
copyLink: 'Copy link',
copyLinkTo: 'Copy link to',
Expand All @@ -206,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',
Expand Down Expand Up @@ -262,6 +247,39 @@ 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:
Expand All @@ -279,17 +297,6 @@ export const translationsBundleEn: PartialTranslations = {
months: 'months',
},
},
productDetailTypes: {
[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',
Expand Down
54 changes: 27 additions & 27 deletions src/translations/nn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ const areas: { [key in Area]?: string } = {
};

export const translationsBundleNn: PartialTranslations = {
relatedContent,
taxonomies,
areas,
stringParts: {
conjunction: 'og',
for: 'for',
Expand All @@ -86,6 +89,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',
},
Expand Down Expand Up @@ -134,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',
Expand All @@ -161,30 +169,15 @@ 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',
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',
Expand All @@ -196,14 +189,6 @@ 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',
},
Expand Down Expand Up @@ -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',
Expand Down
Loading