Skip to content

Commit

Permalink
Reorganize summary2 translation keys
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jondyr
Jondyr committed Jan 13, 2025
1 parent aa46b72 commit 18c9d1c
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 37 deletions.
22 changes: 10 additions & 12 deletions frontend/language/src/nb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,6 @@
"ux_editor.component_properties.hiddenRow": "Angi hvilke rader som skal skjules",
"ux_editor.component_properties.hideBottomBorder": "Skjul skillelinjen under komponenten",
"ux_editor.component_properties.hideChangeButton": "Skjul Endre-knapp",
"ux_editor.component_properties.hideEmptyFields": "Skjul tomme felter",
"ux_editor.component_properties.hideValidationMessages": "Skjul valideringsmeldinger",
"ux_editor.component_properties.icon": "Ikon",
"ux_editor.component_properties.id": "ID",
Expand Down Expand Up @@ -1378,13 +1377,6 @@
"ux_editor.component_properties.optionalIndicator": "Vis valgfri-indikator på ledetekst",
"ux_editor.component_properties.options": "Alternativer",
"ux_editor.component_properties.optionsId": "Kodeliste",
"ux_editor.component_properties.overrides": "Overstyringer",
"ux_editor.component_properties.overrides_description": "Overstyringer per komponent for oppsummeringen",
"ux_editor.component_properties.overrides_is_compact": "Kompakt visning",
"ux_editor.component_properties.overrides_list": "Liste",
"ux_editor.component_properties.overrides_not_set": "Ikke satt",
"ux_editor.component_properties.overrides_string": "Tekst",
"ux_editor.component_properties.overrides_type": "Vis type",
"ux_editor.component_properties.pageBreak": "PDF-innstillinger (pageBreak)",
"ux_editor.component_properties.pageRef": "Navnet til siden det gjelder (pageRef)",
"ux_editor.component_properties.pagination": "Sidenummerering",
Expand Down Expand Up @@ -1452,12 +1444,18 @@
"ux_editor.component_properties.subform.no_existing_layout_set_instructions_header": "Slik gjør du:",
"ux_editor.component_properties.subform.selected_layout_set_label": "Underskjema",
"ux_editor.component_properties.subform.selected_layout_set_title": "Valgt underskjemakobling er {{subform}}",
"ux_editor.component_properties.summary.add_override": "Legg til overstyring",
"ux_editor.component_properties.summary.override.component_id": "ID på komponenten",
"ux_editor.component_properties.summary.override.empty_field_text": "Tekst for tomme felter",
"ux_editor.component_properties.summary.override.force_show": "Vis alltid feltet",
"ux_editor.component_properties.summary.add_override": "Lag en ny overstyring",
"ux_editor.component_properties.summary.override.choose_component": "Velg komponent",
"ux_editor.component_properties.summary.override.description": "Overstyringer per komponent for oppsummeringen",
"ux_editor.component_properties.summary.override.display_type": "Visningstype",
"ux_editor.component_properties.summary.override.display_type.list": "Liste",
"ux_editor.component_properties.summary.override.display_type.not_set": "Ikke satt",
"ux_editor.component_properties.summary.override.display_type.string": "Tekst",
"ux_editor.component_properties.summary.override.empty_field_text": "Tekst du vil vise i tomme felt",
"ux_editor.component_properties.summary.override.hidden": "Skjul feltet",
"ux_editor.component_properties.summary.override.hide_empty_fields": "Skjul tomme felter",
"ux_editor.component_properties.summary.override.show_component": "Vis komponenten",
"ux_editor.component_properties.summary.overrides": "Overstyringer",
"ux_editor.component_properties.summaryDelimiter": "Skillelinje for sammendragsvisningsceller",
"ux_editor.component_properties.tableColumns": "Innstillinger for kolonner",
"ux_editor.component_properties.tableHeaders": "Felter som skal vises i tabellens overskrift",
Expand Down
35 changes: 17 additions & 18 deletions ...rc/components/config/componentSpecificContent/Summary2/Override/Summary2Override.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
expect(
screen.getByRole('combobox', {
name: textMock('ux_editor.component_properties.overrides_type'),
name: textMock('ux_editor.component_properties.summary.override.display_type'),
}),
).toBeInTheDocument();
});
Expand All @@ -54,7 +54,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
expect(
screen.getByRole('combobox', {
name: textMock('ux_editor.component_properties.overrides_type'),
name: textMock('ux_editor.component_properties.summary.override.display_type'),
}),
).toBeInTheDocument();
});
Expand All @@ -64,7 +64,7 @@ describe('Summary2Override', () => {
await userEvent.click(addNewOverrideButton());
expect(
screen.queryByRole('combobox', {
name: textMock('ux_editor.component_properties.overrides_type'),
name: textMock('ux_editor.component_properties.summary.override.display_type'),
}),
).not.toBeInTheDocument();
});
Expand Down Expand Up @@ -113,7 +113,6 @@ describe('Summary2Override', () => {
),
);
});

it('should be able to change override hideEmptyFields', async () => {
const user = userEvent.setup();
render({ overrides: [{ componentId: '1' }] });
Expand All @@ -133,7 +132,7 @@ describe('Summary2Override', () => {
const user = userEvent.setup();
render({ overrides: [{ componentId: container1IdMock, isCompact: false }] });
const compactCheckbox = screen.getByRole('checkbox', {
name: textMock('ux_editor.component_properties.overrides_is_compact'),
name: textMock('ux_editor.component_properties.summary.override.is_compact'),
});
expect(compactCheckbox).toBeInTheDocument();
expect(compactCheckbox).not.toBeChecked();
Expand All @@ -149,7 +148,7 @@ describe('Summary2Override', () => {
const user = userEvent.setup();
render({ overrides: [{ componentId: container1IdMock, isCompact: true }] });
const compactCheckbox = screen.getByRole('checkbox', {
name: textMock('ux_editor.component_properties.overrides_is_compact'),
name: textMock('ux_editor.component_properties.summary.override.is_compact'),
});
expect(compactCheckbox).toBeInTheDocument();
expect(compactCheckbox).toBeChecked();
Expand All @@ -166,17 +165,17 @@ describe('Summary2Override', () => {
await userEvent.click(addNewOverrideButton());
expect(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_list'),
name: textMock('ux_editor.component_properties.summary.override.display_type.list'),
}),
).toBeInTheDocument();
expect(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_string'),
name: textMock('ux_editor.component_properties.summary.override.display_type.string'),
}),
).toBeInTheDocument();
expect(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_not_set'),
name: textMock('ux_editor.component_properties.summary.override.display_type.not_set'),
}),
).toBeInTheDocument();
});
Expand All @@ -187,7 +186,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_list'),
name: textMock('ux_editor.component_properties.summary.override.display_type.list'),
}),
);
await waitFor(() =>
Expand All @@ -203,7 +202,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_string'),
name: textMock('ux_editor.component_properties.summary.override.display_type.string'),
}),
);
await waitFor(() =>
Expand All @@ -219,7 +218,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_not_set'),
name: textMock('ux_editor.component_properties.summary.override.display_type.not_set'),
}),
);
await waitFor(() =>
Expand All @@ -235,7 +234,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_list'),
name: textMock('ux_editor.component_properties.summary.override.display_type.list'),
}),
);
await waitFor(() =>
Expand All @@ -251,7 +250,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_string'),
name: textMock('ux_editor.component_properties.summary.override.display_type.string'),
}),
);
await waitFor(() =>
Expand All @@ -267,7 +266,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_not_set'),
name: textMock('ux_editor.component_properties.summary.override.display_type.not_set'),
}),
);
await waitFor(() =>
Expand All @@ -283,7 +282,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());
await user.click(
screen.getByRole('option', {
name: textMock('ux_editor.component_properties.overrides_string'),
name: textMock('ux_editor.component_properties.summary.override.display_type.string'),
}),
);
await waitFor(() =>
Expand All @@ -299,7 +298,7 @@ describe('Summary2Override', () => {
await user.click(addNewOverrideButton());

const select = screen.getByRole('combobox', {
name: textMock('ux_editor.component_properties.overrides_type'),
name: textMock('ux_editor.component_properties.summary.override.display_type'),
});
await user.selectOptions(select, 'list');
await waitFor(() =>
Expand Down Expand Up @@ -338,7 +337,7 @@ const removeOverrideButton = () => screen.getByRole('button', { name: '' });

const overrideComponentSelect = () =>
screen.getByRole('combobox', {
name: textMock('ux_editor.component_properties.summary.override.component_id'),
name: textMock('ux_editor.component_properties.summary.override.choose_component'),
});

const defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion ...tor/src/components/config/componentSpecificContent/Summary2/Override/Summary2Override.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const Summary2Override = ({ overrides, onChange }: Summary2OverrideProps)
<StudioHeading size='2xs'>{t('ux_editor.component_properties.overrides')}</StudioHeading>
</StudioCard.Header>
<StudioParagraph size='sm'>
{t('ux_editor.component_properties.overrides_description')}
{t('ux_editor.component_properties.summary.override.description')}
</StudioParagraph>
<StudioCard.Content>
{overrides &&
Expand Down
2 changes: 1 addition & 1 deletion ...ponents/config/componentSpecificContent/Summary2/Override/Summary2OverrideDisplayType.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const Summary2OverrideDisplayType = ({
<StudioCard.Content>
<StudioNativeSelect
size='sm'
label={t('ux_editor.component_properties.overrides_type')}
label={t('ux_editor.component_properties.summary.override.display_type')}
onChange={handleCustomTypeChange}
value={override.displayType || 'string'}
>
Expand Down
4 changes: 2 additions & 2 deletions ...rc/components/config/componentSpecificContent/Summary2/Override/Summary2OverrideEntry.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const Summary2OverrideEntry = ({
return (
<>
<Summmary2ComponentReferenceSelector
label={t('ux_editor.component_properties.summary.override.component_id')}
label={t('ux_editor.component_properties.summary.override.choose_component')}
value={override.componentId}
options={componentOptions}
onValueChange={(value) => onChangeOverride('componentId', value)}
Expand Down Expand Up @@ -125,7 +125,7 @@ const ComponentInGroupCheckbox = ({
checked={override.isCompact ?? false}
value='isCompact'
>
{t('ux_editor.component_properties.overrides_is_compact')}
{t('ux_editor.component_properties.summary.override.is_compact')}
</Checkbox>
);
};
15 changes: 12 additions & 3 deletions .../components/config/componentSpecificContent/Summary2/Override/hook/useCustomConfigType.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@ export type CustomConfigType = {
export const useCustomConfigType = (): CustomConfigType[] => {
const { t } = useTranslation();
return [
{ value: 'string', label: t('ux_editor.component_properties.overrides_string') },
{ value: 'list', label: t('ux_editor.component_properties.overrides_list') },
{ value: 'notSet', label: t('ux_editor.component_properties.overrides_not_set') },
{
value: 'string',
label: t('ux_editor.component_properties.summary.override.display_type.string'),
},
{
value: 'list',
label: t('ux_editor.component_properties.summary.override.display_type.list'),
},
{
value: 'notSet',
label: t('ux_editor.component_properties.summary.override.display_type.not_set'),
},
];
};

0 comments on commit 18c9d1c

Please sign in to comment.