From 82b75f7b9d355473817b9a4b505177d312228e34 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Fri, 13 Sep 2024 19:05:21 +0700 Subject: [PATCH] Fix variable scoping error with relation editor widgets --- .../editorwidgets/relationeditors/ordered_relation_editor.qml | 2 +- src/qml/editorwidgets/relationeditors/relation_editor.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml index 4976107877..36a6709ac1 100644 --- a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml +++ b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml @@ -399,7 +399,7 @@ EditorWidgetBase { Label { width: parent.width wrapMode: Text.WordWrap - text: nmRelationId ? qsTr('Should the feature %1 (%2) of layer %3 be unlinked?
(The connection will be deleted on layer %4)').arg(nmReferencedFeatureDisplayMessage).arg(deleteDialog.nmReferencedFeatureId).arg(deleteDialog.nmReferencedLayerName).arg(deleteDialog.referencingLayerName) : qsTr('Should the feature %1 (%2) on layer %3 be deleted?').arg(deleteDialog.referencingFeatureDisplayMessage).arg(deleteDialog.referencingFeatureId).arg(deleteDialog.referencingLayerName) + text: nmRelationId ? qsTr('Should the feature %1 (%2) of layer %3 be unlinked?
(The connection will be deleted on layer %4)').arg(deleteDialog.nmReferencedFeatureDisplayMessage).arg(deleteDialog.nmReferencedFeatureId).arg(deleteDialog.nmReferencedLayerName).arg(deleteDialog.referencingLayerName) : qsTr('Should the feature %1 (%2) on layer %3 be deleted?').arg(deleteDialog.referencingFeatureDisplayMessage).arg(deleteDialog.referencingFeatureId).arg(deleteDialog.referencingLayerName) } standardButtons: Dialog.Ok | Dialog.Cancel diff --git a/src/qml/editorwidgets/relationeditors/relation_editor.qml b/src/qml/editorwidgets/relationeditors/relation_editor.qml index 84bbb34ebc..0e3b2bb508 100644 --- a/src/qml/editorwidgets/relationeditors/relation_editor.qml +++ b/src/qml/editorwidgets/relationeditors/relation_editor.qml @@ -305,7 +305,7 @@ EditorWidgetBase { Label { width: parent.width wrapMode: Text.WordWrap - text: nmRelationId ? qsTr('Should the feature %1 (%2) of layer %3 be unlinked?
(The connection will be deleted on layer %4)').arg(nmReferencedFeatureDisplayMessage).arg(deleteDialog.nmReferencedFeatureId).arg(deleteDialog.nmReferencedLayerName).arg(deleteDialog.referencingLayerName) : qsTr('Should the feature %1 (%2) on layer %3 be deleted?').arg(deleteDialog.referencingFeatureDisplayMessage).arg(deleteDialog.referencingFeatureId).arg(deleteDialog.referencingLayerName) + text: nmRelationId ? qsTr('Should the feature %1 (%2) of layer %3 be unlinked?
(The connection will be deleted on layer %4)').arg(deleteDialog.nmReferencedFeatureDisplayMessage).arg(deleteDialog.nmReferencedFeatureId).arg(deleteDialog.nmReferencedLayerName).arg(deleteDialog.referencingLayerName) : qsTr('Should the feature %1 (%2) on layer %3 be deleted?').arg(deleteDialog.referencingFeatureDisplayMessage).arg(deleteDialog.referencingFeatureId).arg(deleteDialog.referencingLayerName) } standardButtons: Dialog.Ok | Dialog.Cancel