Merge branch 'feature/media-library-screen' into feature/media-library-phase2
# Conflicts: # frontend/src/i18n/locales/en/translation.json # frontend/src/i18n/locales/nl/translation.json
This commit is contained in:
@@ -100,7 +100,6 @@ function FocusEditor({ image, onApply, onClose, onReset }: { image: HeroImageDto
|
|||||||
return (
|
return (
|
||||||
<div className="space-y-4" data-testid="focus-dialog">
|
<div className="space-y-4" data-testid="focus-dialog">
|
||||||
<p className="text-sm text-muted-foreground">{t('hero.focus.intro')}</p>
|
<p className="text-sm text-muted-foreground">{t('hero.focus.intro')}</p>
|
||||||
<p className="text-sm font-medium" data-testid="focus-apply-hint">{t('hero.focus.applyHint')}</p>
|
|
||||||
|
|
||||||
<fieldset className="flex flex-wrap gap-4">
|
<fieldset className="flex flex-wrap gap-4">
|
||||||
<legend className="sr-only">{t('hero.focus.targetLegend')}</legend>
|
<legend className="sr-only">{t('hero.focus.targetLegend')}</legend>
|
||||||
|
|||||||
@@ -281,7 +281,8 @@ describe('Focus dialog', () => {
|
|||||||
expect(screen.getByTestId('focus-y')).toHaveValue(50);
|
expect(screen.getByTestId('focus-y')).toHaveValue(50);
|
||||||
expect(screen.getByTestId('focus-preview-wide')).toBeInTheDocument();
|
expect(screen.getByTestId('focus-preview-wide')).toBeInTheDocument();
|
||||||
expect(screen.getByTestId('focus-preview-tall')).toBeInTheDocument();
|
expect(screen.getByTestId('focus-preview-tall')).toBeInTheDocument();
|
||||||
expect(screen.getByTestId('focus-apply-hint')).toHaveTextContent(/pas nadat je de hero opslaat|only takes effect when you save the hero/);
|
// A crop is processed at once: there is no note about saving the hero.
|
||||||
|
expect(screen.queryByTestId('focus-apply-hint')).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('moves the point with the keyboard', async () => {
|
it('moves the point with the keyboard', async () => {
|
||||||
|
|||||||
@@ -709,7 +709,6 @@
|
|||||||
"tall": "Portrait preview"
|
"tall": "Portrait preview"
|
||||||
},
|
},
|
||||||
"apply": "Apply",
|
"apply": "Apply",
|
||||||
"applyHint": "The change only takes effect when you save the hero. If you leave the page without saving it is dropped.",
|
|
||||||
"previewPending": "The preview of this photo is being prepared. Close this window and try again in a few seconds.",
|
"previewPending": "The preview of this photo is being prepared. Close this window and try again in a few seconds.",
|
||||||
"reset": "Use the photo’s crop again"
|
"reset": "Use the photo’s crop again"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -709,7 +709,6 @@
|
|||||||
"tall": "Voorbeeld staand"
|
"tall": "Voorbeeld staand"
|
||||||
},
|
},
|
||||||
"apply": "Toepassen",
|
"apply": "Toepassen",
|
||||||
"applyHint": "De wijziging geldt pas nadat je de hero opslaat. Verlaat je de pagina zonder op te slaan, dan vervalt ze.",
|
|
||||||
"previewPending": "Het voorbeeld van deze foto wordt klaargezet. Sluit dit venster en probeer het over een paar seconden opnieuw.",
|
"previewPending": "Het voorbeeld van deze foto wordt klaargezet. Sluit dit venster en probeer het over een paar seconden opnieuw.",
|
||||||
"reset": "Terug naar de uitsnede van de foto"
|
"reset": "Terug naar de uitsnede van de foto"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user