Merge branch 'master' into release/2.4.0

contao-community-alliance · Sep 24, 2024 · 7f17920 · 7f17920
2 parents e5182c9 + d328beb
commit 7f17920
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/OverrideAllHandler.php b/src/Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/OverrideAllHandler.php
@@ -329,7 +329,7 @@ private function renderFieldSets(
         $translator = $environment->getTranslator();
         assert($translator instanceof TranslatorInterface);
 
-        if ('' !== $fieldSet['palette']) {
+        if ('' === $fieldSet['palette']) {
             $fieldSet['palette'] = \sprintf(
                 '<p>&nbsp;</p><strong>%s</strong><p>&nbsp;</p>',
                 $translator->translate('no_properties_available', 'dc-general')

diff --git a/...Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/SelectPropertyAllHandler.php b/...Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/SelectPropertyAllHandler.php
@@ -235,12 +235,18 @@ private function isPropertyAllowed(PropertyInterface $property, EnvironmentInter
             $inputProvider = $environment->getInputProvider();
             assert($inputProvider instanceof InputProviderInterface);
 
+            $definition = $environment->getDataDefinition();
+            assert($definition instanceof ContainerInterface);
+
+            $modelName = $definition->getBasicDefinition()->getDataProvider();
+
             Message::addInfo(
                 $translator->translate(
                     'not_allowed_property_info',
                     'dc-general',
                     [
-                        '%property%' => $property->getLabel() ?: $property->getName(),
+                        '%property%' => $translator->translate($property->getLabel(), $modelName)
+                            ?: $property->getName(),
                         '%mode%'     => $translator->translate(
                             $inputProvider->getParameter('mode') . 'Selected',
                             'dc-general'