Changes for MM xliff

contao-community-alliance · May 13, 2024 · 5b8a374 · 5b8a374
1 parent 898f7e3
commit 5b8a374
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ActionHandler/AbstractListShowAllHandler.php b/src/Contao/View/Contao2BackendView/ActionHandler/AbstractListShowAllHandler.php
@@ -336,12 +336,16 @@ protected function translate($key, $domain, array $parameters = [])
             );
             // @codingStandardsIgnoreEnd
 
+            $oldKey = sprintf('%s.%s', $domain, $key);
             $translated =
                 $this->translator->trans(
-                    sprintf('%s.%s', $domain, $key),
+                    $oldKey,
                     $parameters,
                     sprintf('contao_%s', $domain)
                 );
+            if ($translated === $oldKey) {
+                return $key;
+            }
         }
 
         return $translated;

diff --git a/src/Contao/View/Contao2BackendView/ActionHandler/ParentedListViewShowAllHandler.php b/src/Contao/View/Contao2BackendView/ActionHandler/ParentedListViewShowAllHandler.php
@@ -239,8 +239,8 @@ private function translateHeaderColumnName($field, $parentName)
         // FIXME: deprecation here? - old translation handling.
 
         return ('tstamp' === $field)
-            ? $this->translate('tstamp', 'contao_dc-general')
-            : $this->translate(\sprintf('%s.0', $field), 'contao_' . $parentName);
+            ? $this->translate('tstamp', 'dc-general')
+            : $this->translate(\sprintf('%s.0', $field), $parentName);
     }
 
     /**

diff --git a/src/Contao/View/Contao2BackendView/ButtonRenderer.php b/src/Contao/View/Contao2BackendView/ButtonRenderer.php
@@ -658,7 +658,15 @@ protected function translateButtonDescription(
             return $header;
         }
 
-        return $this->translator->translate($buttonName . '.1', $definitionName, $parameter);
+        if (
+            1 !== preg_match('#%(?:[bcdeEfFgGhHosuxX]|\d*\$[bcdeEfFgGhHosuxX])#', $buttonName)
+            && $definitionName . '.' . $buttonName . '.1'
+            !== ($header = $this->translator->translate($definitionName . '.' . $buttonName . '.1', 'contao_' . $definitionName, $parameter))
+        ) {
+            return $header;
+        }
+
+        return vsprintf($buttonName, $parameter);
     }
 
     /**

diff --git a/src/Contao/View/Contao2BackendView/GlobalButtonRenderer.php b/src/Contao/View/Contao2BackendView/GlobalButtonRenderer.php
@@ -120,6 +120,18 @@ private function renderButton(CommandInterface $command)
     {
         $extra = $command->getExtra();
         $label = $this->translate($command->getLabel());
+        // Translation fallback to old Contao translations.
+        // @deprecated Remove in 3.0
+        if (str_ends_with($label, '.label') && $label === $command->getLabel()) {
+            $label = $this->translate(substr($command->getLabel(), 0, -6) . '.0');
+        }
+
+        $description = $this->translate($command->getDescription());
+        // Translation fallback to old Contao translations.
+        // @deprecated Remove in 3.0
+        if (str_ends_with($description, '.description') && $description === $command->getDescription()) {
+            $description = $this->translate(substr($command->getDescription(), 0, -12) . '.1');
+        }
 
         if (isset($extra['href'])) {
             $href = $extra['href'];
@@ -150,7 +162,7 @@ private function renderButton(CommandInterface $command)
             ->setKey($command->getName())
             ->setHref($href)
             ->setLabel($label)
-            ->setTitle($this->translate($command->getDescription()));
+            ->setTitle($description);
         $this->dispatcher->dispatch($buttonEvent, GetGlobalButtonEvent::NAME);
 
         // Allow to override the button entirely - if someone sets empty string, we keep it.
@@ -181,8 +193,12 @@ private function translate(string $path): string
         $definition = $this->environment->getDataDefinition();
         assert($definition instanceof ContainerInterface);
 
-        $value = $this->translator->translate($path, $definition->getName());
-        if ($path !== $value) {
+        $domain = $definition->getName();
+        if ($path !== ($value = $this->translator->translate($path, $domain))) {
+            return $value;
+        }
+        // Fallback translate for non symfony domain.
+        if ($domain . '.' . $path !== ($value = $this->translator->translate($domain . '.' . $path, 'contao_' . $domain))) {
             return $value;
         }