Merge pull request #5667 from bijusk/sprint-i18n-childnodes

BUGFIX: Translate label for childNodes

Author: Sebobo

Neos.ContentRepository/Classes/Domain/Model/ExpressionBasedNodeLabelGenerator.php

@@ -14,6 +14,7 @@
 use Neos\Eel\EelEvaluatorInterface;
 use Neos\Eel\Utility;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\I18n\EelHelper\TranslationHelper;
 use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 
 /**
@@ -34,6 +35,12 @@ class ExpressionBasedNodeLabelGenerator implements NodeLabelGeneratorInterface
      */
     protected $defaultContextConfiguration;
 
+    /**
+     * @Flow\Inject
+     * @var TranslationHelper
+     */
+    protected $translationHelper;
+
     /**
      * @var string
      */
@@ -73,14 +80,19 @@ public function initializeObject()
     public function getLabel(\Neos\ContentRepository\Domain\Projection\Content\NodeInterface $node): string
     {
         $expression = $this->getExpression();
+
         if ($node->isAutoCreated()) {
             $parentNode = $node->getParent();
             $property = 'childNodes.' . $node->getName() . '.label';
             if ($parentNode?->getNodeType()->hasConfiguration($property)) {
                 $expression = $parentNode->getNodeType()->getConfiguration($property);
             }
         }
+
         if (Utility::parseEelExpression($expression) === null) {
+            if ($node->isAutoCreated()) {
+                return $this->translationHelper->translate($expression);
+            }
             return $expression;
         }
         return (string)Utility::evaluateEelExpression($expression, $this->eelEvaluator, ['node' => $node], $this->defaultContextConfiguration);

Neos.Neos/Classes/Aspects/NodeTypeConfigurationEnrichmentAspect.php

@@ -57,9 +57,7 @@ public function enrichNodeTypeLabelsConfiguration(JoinPointInterface $joinPoint)
         $declaredSuperTypes = $joinPoint->getMethodArgument('declaredSuperTypes');
         $configuration = $joinPoint->getMethodArgument('configuration');
         $nodeTypeName = $joinPoint->getMethodArgument('name');
-
         $this->addLabelsToNodeTypeConfiguration($nodeTypeName, $configuration, $declaredSuperTypes);
-
         $joinPoint->setMethodArgument('configuration', $configuration);
         $joinPoint->getAdviceChain()->proceed($joinPoint);
     }
@@ -79,6 +77,26 @@ protected function addLabelsToNodeTypeConfiguration($nodeTypeName, array &$confi
         if (isset($configuration['properties'])) {
             $this->setPropertyLabels($nodeTypeName, $configuration, $declaredSuperTypes);
         }
+
+        if (isset($configuration['childNodes'])) {
+            $this->setChildNodeLabels($nodeTypeName, $configuration);
+        }
+    }
+
+
+    /**
+     * @param string $nodeTypeName
+     * @param array $configuration
+     * @return void
+     */
+    protected function setChildNodeLabels(string $nodeTypeName, array &$configuration)
+    {
+        $nodeTypeLabelIdPrefix = $this->generateNodeTypeLabelIdPrefix($nodeTypeName);
+        foreach ($configuration['childNodes'] as $childNodeName => &$childNodeConfiguration) {
+            if ($childNodeConfiguration && $this->shouldFetchTranslation($childNodeConfiguration)) {
+                $childNodeConfiguration['label'] = $this->getChildNodeLabelTranslationId($nodeTypeLabelIdPrefix, $childNodeName);
+            }
+        }
     }
 
     /**
@@ -300,6 +318,18 @@ protected function getPropertyLabelTranslationId($nodeTypeSpecificPrefix, $prope
         return $nodeTypeSpecificPrefix . 'properties.' . $propertyName;
     }
 
+    /**
+     * Generates a childNode label with the given $nodeTypeSpecificPrefix.
+     *
+     * @param string $nodeTypeSpecificPrefix
+     * @param string $childNodeName
+     * @return string
+     */
+    protected function getChildNodeLabelTranslationId(string $nodeTypeSpecificPrefix, string $childNodeName)
+    {
+        return $nodeTypeSpecificPrefix . 'childNodes.' . $childNodeName;
+    }
+
     /**
      * Generates a property configuration-label with the given $nodeTypeSpecificPrefix.
      *