Changes for MM xliff

src/Contao/Dca/Builder/Legacy/LegacyDcaDataDefinitionBuilder.php

@@ -120,7 +120,6 @@
 use function explode;
 use function in_array;
 use function is_array;
-use function is_callable;
 use function next;
 use function parse_str;
 use function reset;

src/Contao/Picker/PagePickerProvider.php

@@ -67,7 +67,7 @@ public function __construct(
      */
     public function getName()
     {
-        return 'ccaPagePicker';
+        return 'pagePicker';
     }
 
     /**

src/Contao/View/Contao2BackendView/ActionHandler/AbstractListShowAllHandler.php

@@ -76,6 +76,9 @@
 
 use function array_key_exists;
 use function implode;
+use function in_array;
+use function is_string;
+use function sprintf;
 use function str_contains;
 use function str_replace;
 use function trigger_error;
@@ -154,7 +157,7 @@ public function __construct(
         }
         if (null === $tokenName) {
             $tokenName = System::getContainer()->getParameter('contao.csrf_token_name');
-            assert(\is_string($tokenName));
+            assert(is_string($tokenName));
 
             // @codingStandardsIgnoreStart
             @trigger_error(
@@ -264,7 +267,7 @@ protected function process(Action $action, EnvironmentInterface $environment)
      *
      * @return string
      */
-    private function languageSwitcher(EnvironmentInterface $environment)
+    private function languageSwitcher(EnvironmentInterface $environment): string
     {
         $template = new ContaoBackendViewTemplate('dcbe_general_language_selector');
 
@@ -335,9 +338,9 @@ protected function translate($key, $domain, array $parameters = [])
 
             $translated =
                 $this->translator->trans(
-                    \sprintf('%s.%s', $domain, $key),
+                    sprintf('%s.%s', $domain, $key),
                     $parameters,
-                    \sprintf('contao_%s', $domain)
+                    sprintf('contao_%s', $domain)
                 );
         }
 
@@ -494,7 +497,7 @@ protected function loadCollection(EnvironmentInterface $environment)
      *
      * @return string
      */
-    private function generateHeaderButtons(EnvironmentInterface $environment)
+    private function generateHeaderButtons(EnvironmentInterface $environment): string
     {
         return (new GlobalButtonRenderer($environment))->render();
     }
@@ -512,7 +515,7 @@ private function renderCollection(
         EnvironmentInterface $environment,
         CollectionInterface $collection,
         array $grouping
-    ) {
+    ): void {
         $definition = $environment->getDataDefinition();
         assert($definition instanceof ContainerInterface);
 
@@ -578,7 +581,7 @@ private function addGroupHeader(
         &$groupClass,
         &$eoCount,
         &$remoteCur = null
-    ) {
+    ): void {
         if ($grouping && GroupAndSortingInformationInterface::GROUP_NONE !== $grouping['mode']) {
             $remoteNew = $this->renderGroupHeader(
                 $grouping['property'],
@@ -612,7 +615,7 @@ private function addGroupHeader(
      *
      * @return string When no information of panels can be obtained from the data container.
      */
-    private function panel(EnvironmentInterface $environment, $ignoredPanels = [])
+    private function panel(EnvironmentInterface $environment, array $ignoredPanels = []): string
     {
         $view = $environment->getView();
         assert($view instanceof BackendViewInterface);
@@ -627,7 +630,7 @@ private function panel(EnvironmentInterface $environment, $ignoredPanels = [])
      *
      * @return array
      */
-    private function getTableHead(EnvironmentInterface $environment)
+    private function getTableHead(EnvironmentInterface $environment): array
     {
         $definition = $environment->getDataDefinition();
         assert($definition instanceof ContainerInterface);
@@ -638,7 +641,7 @@ private function getTableHead(EnvironmentInterface $environment)
         $columns    = $this->getSortingColumns($sorting);
         foreach ($formatter->getPropertyNames() as $field) {
             $tableHead[] = [
-                'class'   => 'tl_folder_tlist col_' . $field . (\in_array($field, $columns) ? ' ordered_by' : ''),
+                'class'   => 'tl_folder_tlist col_' . $field . (in_array($field, $columns) ? ' ordered_by' : ''),
                 'content' => $this->translateButtonLabel($field, $definition->getName())
             ];
         }
@@ -666,12 +669,12 @@ private function getTableHead(EnvironmentInterface $environment)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     private function renderGroupHeader(
-        $field,
+        string $field,
         ModelInterface $model,
-        $groupMode,
-        $groupLength,
+        string $groupMode,
+        int $groupLength,
         EnvironmentInterface $environment
-    ) {
+    ): ?string {
         $definition = $environment->getDataDefinition();
         assert($definition instanceof ContainerInterface);
 
@@ -716,7 +719,7 @@ protected function getSelectButtons(EnvironmentInterface $environment)
      *
      * @return bool
      */
-    private function isSortable(EnvironmentInterface $environment)
+    private function isSortable(EnvironmentInterface $environment): bool
     {
         $definition = $environment->getDataDefinition();
         assert($definition instanceof ContainerInterface);
@@ -751,7 +754,7 @@ protected function renderPasteTopButton(EnvironmentInterface $environment, $sort
         assert($basicDefinition instanceof BasicDefinitionInterface);
 
         $dataProvider = $basicDefinition->getDataProvider();
-        assert(\is_string($dataProvider));
+        assert(is_string($dataProvider));
 
         $filter->andModelIsFromProvider($dataProvider);
 
@@ -784,7 +787,7 @@ protected function renderPasteTopButton(EnvironmentInterface $environment, $sort
             ContaoEvents::IMAGE_GET_HTML
         );
 
-        return \sprintf(
+        return sprintf(
             '<a href="%s" title="%s" onclick="Backend.getScrollOffset()">%s</a>',
             $urlEvent->getUrl(),
             $this->translateButtonLabel('pastenew', $definition->getName()),
@@ -802,7 +805,7 @@ protected function renderPasteTopButton(EnvironmentInterface $environment, $sort
      * @SuppressWarnings(PHPMD.Superglobals)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
-    private function breadcrumb(EnvironmentInterface $environment)
+    private function breadcrumb(EnvironmentInterface $environment): ?string
     {
         $event = new GetBreadcrumbEvent($environment);
 
@@ -830,7 +833,7 @@ private function breadcrumb(EnvironmentInterface $environment)
      *
      * @return array
      */
-    private function getSortingColumns($sortingDefinition)
+    private function getSortingColumns(?GroupAndSortingDefinitionInterface $sortingDefinition): array
     {
         if (null === $sortingDefinition) {
             return [];
@@ -855,7 +858,7 @@ private function getSortingColumns($sortingDefinition)
      *
      * @return array
      */
-    private function getSelectContainer(EnvironmentInterface $environment)
+    private function getSelectContainer(EnvironmentInterface $environment): array
     {
         $inputProvider = $environment->getInputProvider();
         assert($inputProvider instanceof InputProviderInterface);
@@ -892,7 +895,7 @@ private function getSelectContainer(EnvironmentInterface $environment)
      *
      * @return void
      */
-    private function handleEditAllButton(CollectionInterface $collection, EnvironmentInterface $environment)
+    private function handleEditAllButton(CollectionInterface $collection, EnvironmentInterface $environment): void
     {
         if (0 < $collection->count()) {
             return;

src/Contao/View/Contao2BackendView/ActionHandler/CopyHandler.php

@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2023 Contao Community Alliance.
+ * (c) 2013-2024 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,14 +17,13 @@
  * @author     Sven Baumann <[email protected]>
  * @author     Richard Henkenjohann <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2013-2023 Contao Community Alliance.
+ * @copyright  2013-2024 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 namespace ContaoCommunityAlliance\DcGeneral\Contao\View\Contao2BackendView\ActionHandler;
 
-use Contao\System;
 use ContaoCommunityAlliance\Contao\Bindings\ContaoEvents;
 use ContaoCommunityAlliance\Contao\Bindings\Events\Controller\RedirectEvent;
 use ContaoCommunityAlliance\Contao\Bindings\Events\System\LogEvent;
@@ -48,6 +47,8 @@
 use ContaoCommunityAlliance\UrlBuilder\Contao\CsrfUrlBuilderFactory;
 use ContaoCommunityAlliance\UrlBuilder\UrlBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * Class CopyModelController handles copy action on a model.
@@ -65,19 +66,41 @@ class CopyHandler
      *
      * @var CsrfUrlBuilderFactory
      */
-    private $securityUrlBuilder;
+    private CsrfUrlBuilderFactory $securityUrlBuilder;
+
+    /**
+     * The request stack.
+     *
+     * @var RequestStack
+     */
+    private RequestStack $requestStack;
+
+    /**
+     * The URL generator.
+     *
+     * @var UrlGeneratorInterface
+     */
+    private UrlGeneratorInterface $urlGenerator;
 
     /**
      * PasteHandler constructor.
      *
      * @param RequestScopeDeterminator $scopeDeterminator  The request mode determinator.
      * @param CsrfUrlBuilderFactory    $securityUrlBuilder The URL builder factory for URLs with security token.
+     * @param RequestStack             $requestStack       The request stack.
+     * @param UrlGeneratorInterface    $urlGenerator       The URL generator.
      */
-    public function __construct(RequestScopeDeterminator $scopeDeterminator, CsrfUrlBuilderFactory $securityUrlBuilder)
-    {
+    public function __construct(
+        RequestScopeDeterminator $scopeDeterminator,
+        CsrfUrlBuilderFactory $securityUrlBuilder,
+        RequestStack $requestStack,
+        UrlGeneratorInterface $urlGenerator,
+    ) {
         $this->setScopeDeterminator($scopeDeterminator);
 
         $this->securityUrlBuilder = $securityUrlBuilder;
+        $this->requestStack       = $requestStack;
+        $this->urlGenerator       = $urlGenerator;
     }
 
     /**
@@ -230,24 +253,38 @@ protected function redirect($environment, $copiedModelId)
             return;
         }
 
-        // Build a clean url to remove the copy related arguments instead of using the AddToUrlEvent.
-        $urlBuilder = new UrlBuilder();
-        $urlBuilder
-            ->setPath('contao')
-            ->setQueryParameter('do', $inputProvider->getParameter('do'))
-            ->setQueryParameter('table', $copiedModelId->getDataProviderName())
-            ->setQueryParameter('act', 'edit')
-            ->setQueryParameter('id', $copiedModelId->getSerialized());
-        if (null !== ($pid = $inputProvider->getParameter('pid'))) {
-            $urlBuilder->setQueryParameter('pid', $pid);
-        }
-
-        $redirectEvent = new RedirectEvent($this->securityUrlBuilder->create($urlBuilder->getUrl())->getUrl());
-
         if (null === ($dispatcher = $environment->getEventDispatcher())) {
             return;
         }
 
+        $request   = $this->requestStack->getCurrentRequest();
+        $routeName = $request?->attributes->get('_route');
+        // Build a clean url to remove the copy related arguments instead of using the AddToUrlEvent.
+        $urlBuilder = new UrlBuilder();
+        if ($routeName !== 'contao.backend') {
+            $params = [
+                'table' => $copiedModelId->getDataProviderName(),
+                'act'   => 'edit',
+                'id'    => $copiedModelId->getSerialized(),
+            ];
+            if (null !== ($pid = $inputProvider->getParameter('pid'))) {
+                $params['pid'] = $pid;
+            }
+            $url = $this->urlGenerator->generate($routeName, $params);
+        } else {
+            $urlBuilder
+                ->setPath('contao')
+                ->setQueryParameter('do', $inputProvider->getParameter('do'))
+                ->setQueryParameter('table', $copiedModelId->getDataProviderName())
+                ->setQueryParameter('act', 'edit')
+                ->setQueryParameter('id', $copiedModelId->getSerialized());
+            if (null !== ($pid = $inputProvider->getParameter('pid'))) {
+                $urlBuilder->setQueryParameter('pid', $pid);
+            }
+            $url = $urlBuilder->getUrl();
+        }
+        $redirectEvent = new RedirectEvent($this->securityUrlBuilder->create($url)->getUrl());
+
         $dispatcher->dispatch($redirectEvent, ContaoEvents::CONTROLLER_REDIRECT);
     }
 
@@ -308,7 +345,7 @@ protected function process(EnvironmentInterface $environment)
      *
      * @return string|bool
      */
-    private function checkPermission(EnvironmentInterface $environment)
+    private function checkPermission(EnvironmentInterface $environment): bool|string
     {
         if (null === ($definition = $environment->getDataDefinition())) {
             return false;

src/Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/SelectPropertyAllHandler.php

@@ -194,11 +194,11 @@ private function getCollection(
             $model->setID($property->getName());
             $model->setProperty(
                 'name',
-                $property->getLabel() ?: $property->getName()
+                $this->translator->trans($property->getLabel(), [], $definition->getName())
             );
             $model->setProperty(
                 'description',
-                $property->getDescription() ?: $property->getName()
+                $this->translator->trans($property->getDescription(), [], $definition->getName())
             );
 
             $this->handlePropertyFileTree($property);

src/Contao/View/Contao2BackendView/ActionHandler/SelectHandler.php

@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2023 Contao Community Alliance.
+ * (c) 2013-2024 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,7 @@
  * @author     Stefan Heimes <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2013-2023 Contao Community Alliance.
+ * @copyright  2013-2024 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -617,6 +617,9 @@ private function getSelectCollection(EnvironmentInterface $environment)
         foreach (($session['models'] ?? []) as $modelId) {
             $modelIds[] = ModelId::fromSerialized($modelId)->getId();
         }
+        if ([] === $modelIds) {
+            return $dataProvider->getEmptyCollection();
+        }
 
         $idProperty = method_exists($dataProvider, 'getIdProperty') ? $dataProvider->getIdProperty() : 'id';
         $collection = $dataProvider->fetchAll(

src/Contao/View/Contao2BackendView/ButtonRenderer.php

@@ -325,10 +325,12 @@ private function hasPasteNewButton()
     private function buildCommand($command, $model, $previous, $next, $isCircularReference, $childIds)
     {
         $extra      = (array) $command->getExtra();
-        $attributes = '';
-
-        if (!empty($extra['attributes'])) {
-            $attributes .= sprintf($extra['attributes'], $model->getID());
+        if ('' !== ($attributes = $extra['attributes'] ?? '')) {
+            // BC compatibility with legacy strings containing 'Edit item %s'
+            if (!str_contains($attributes, '%id%')) {
+                $attributes = sprintf($attributes, $model->getID());
+            }
+            $attributes = strtr($attributes, ['%id%' => $model->getId()]);
         }
         $icon = $extra['icon'];