From 45a311cd86adf4ed0ee5bb0e5439920fea6dfaa3 Mon Sep 17 00:00:00 2001 From: andreastanderen Date: Wed, 14 Aug 2024 16:02:09 +0200 Subject: [PATCH] Fix PR comments --- frontend/language/src/nb.json | 4 ++++ .../packages/ux-editor/src/components/Properties/Text.tsx | 8 ++++---- .../ConflictingImageSourceAlert.tsx | 7 +++++-- .../components/config/editModal/EditImage/EditImage.tsx | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json index 47afe733a73..4948e4c70aa 100644 --- a/frontend/language/src/nb.json +++ b/frontend/language/src/nb.json @@ -1798,6 +1798,8 @@ "ux_editor.properties_panel.images.cancel_image_upload": "Avbryt opplastning", "ux_editor.properties_panel.images.choose_from_library": "Velg fra biblioteket", "ux_editor.properties_panel.images.choose_from_library_modal_title": "Velg bilde fra applikasjonens bildebibliotk", + "ux_editor.properties_panel.images.conflicting_image_source_when_entering_url": "Du har allerede lastet opp et bilde. Skriver du inn en url, vil bildereferansen din bli slettet.", + "ux_editor.properties_panel.images.conflicting_image_source_when_uploading_image": "Du har allerede referert til en ekstern url. Laster du opp et bilde, vil den eksterne referansen bli slettet.", "ux_editor.properties_panel.images.delete_image_options_modal_button_only_ref": "Slett kun bildereferanse", "ux_editor.properties_panel.images.delete_image_options_modal_button_ref_and_from_library": "Slett bilde", "ux_editor.properties_panel.images.delete_image_options_modal_content_only_ref": "Sletter du kun bildereferansen vil bildet fortsatt eksistere i biblioteket.", @@ -1822,6 +1824,8 @@ "ux_editor.properties_panel.options.use_code_list_label": "Bruk kodeliste", "ux_editor.properties_panel.texts.loading": "Laster inn tekster", "ux_editor.properties_panel.texts.no_properties": "Det er ingen tekster å konfigurere for denne komponenten.", + "ux_editor.properties_panel.texts.sub_title_images": "Valg for bilde", + "ux_editor.properties_panel.texts.sub_title_texts": "Tekster", "ux_editor.radios_error_DuplicateValues": "Alle verdier må være unike.", "ux_editor.radios_error_NoOptions": "Det må være minst én radioknapp.", "ux_editor.radios_option": "Radioknapp {{optionNumber}}", diff --git a/frontend/packages/ux-editor/src/components/Properties/Text.tsx b/frontend/packages/ux-editor/src/components/Properties/Text.tsx index 838a83acf49..69139b61c08 100644 --- a/frontend/packages/ux-editor/src/components/Properties/Text.tsx +++ b/frontend/packages/ux-editor/src/components/Properties/Text.tsx @@ -35,8 +35,8 @@ export const Text = () => { return ( <> - - {'Tekster'} + + {t('ux_editor.properties_panel.texts.sub_title_texts')} {schema.properties.textResourceBindings?.properties && ( { )} {form.type === 'Image' && ( <> - - {'Valg for bilde'} + + {t('ux_editor.properties_panel.texts.sub_title_images')} { + const { t } = useTranslation(); + return ( showAlert && ( {conflictSource === 'external' - ? 'Du har allerede lastet opp et bilde. Skriver du inn en url, vil bildereferansen din bli slettet.' - : 'Du har allerede referert til en ekstern url. Laster du opp et bilde, vil den eksterne referansen bli slettet.'} + ? t('ux_editor.properties_panel.images.conflicting_image_source_when_entering_url') + : t('ux_editor.properties_panel.images.conflicting_image_source_when_uploading_image')} ) ); diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx index 8a591c2043c..92f4677dc68 100644 --- a/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx +++ b/frontend/packages/ux-editor/src/components/config/editModal/EditImage/EditImage.tsx @@ -29,7 +29,7 @@ export const EditImage = ({ component, handleComponentChange }: EditImageProps) const { mutate: deleteImageFromLibrary } = useDeleteImageMutation(org, app); const fileName = extractFileNameFromImageSrc(component.image?.src?.nb, org, app); - const imageOriginsFromLibrary = !imageFileNamesArePending && imageFileNames.includes(fileName); + const imageOriginsFromLibrary = !imageFileNamesArePending && imageFileNames?.includes(fileName); const handleImageChange = async (imageSource: string, fromUrl: boolean = false) => { const updatedComponent = updateComponentWithImage(