Fix translations for buttons

contao-community-alliance · Aug 5, 2024 · 216bcdb · 216bcdb
1 parent a34178e
commit 216bcdb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ButtonRenderer.php b/src/Contao/View/Contao2BackendView/ButtonRenderer.php
@@ -365,10 +365,10 @@ private function buildCommand(
             ->setCommand($command)
             ->setObjModel($model)
             ->setAttributes($attributes)
-            ->setLabel($this->getCommandLabel($command))
+            ->setLabel($this->getCommandLabel($command, $definitionName, ['%id%' => $model->getId()]))
             ->setTitle(
                 $this->translateButtonDescription(
-                    str_replace(['.description', '.1'], '', $command->getDescription()),
+                    \preg_replace('#(\.description|\.1)$#', '', $command->getDescription()),
                     $definitionName,
                     ['%id%' => $model->getId()]
                 )
@@ -775,12 +775,16 @@ private function calculateHref(CommandInterface $command, ModelInterface $model)
      *
      * @return string
      */
-    private function getCommandLabel(CommandInterface $command): string
+    private function getCommandLabel(CommandInterface $command, string $definitionName, array $parameter = []): string
     {
         if ('' === $label = $command->getLabel()) {
             $label = $command->getName();
         }
 
-        return $this->translate($label);
+        return $this->translateButtonLabel(
+            \preg_replace('#(\.label|\.0)$#', '', $label),
+            $definitionName,
+            $parameter
+        );
     }
 }
diff --git a/src/Resources/contao/templates/dcbe_general_common_list.html5 b/src/Resources/contao/templates/dcbe_general_common_list.html5
@@ -37,11 +37,14 @@ assert($translator instanceof TranslatorInterface);
                 </div>
             <?php endif; ?>
             <?php $this->block('parent-header'); ?>
-            <?php if (!empty($this->header)) : ?>
+            <?php if ($this->header || $this->headerButtons) : ?>
                 <div class="tl_header hover-div">
+                  <?php if ($this->headerButtons) : ?>
                     <div class="tl_content_right">
                         <?= $this->headerButtons ?>
                     </div>
+                  <?php endif; ?>
+                  <?php if ($this->header) : ?>
                     <table class="tl_header_table">
                         <?php foreach ($this->header as $key => $value) : ?>
                             <tr>
@@ -50,6 +53,7 @@ assert($translator instanceof TranslatorInterface);
                             </tr>
                         <?php endforeach; ?>
                     </table>
+                  <?php endif; ?>
                 </div>
             <?php endif; ?>
             <?php $this->endblock(); ?>

diff --git a/src/Resources/public/css/generalDriver.css b/src/Resources/public/css/generalDriver.css
diff --git a/src/Resources/public/css/generalDriver.css.map b/src/Resources/public/css/generalDriver.css.map
diff --git a/src/Resources/public/sass/_headerButton.scss b/src/Resources/public/sass/_headerButton.scss
@@ -2,3 +2,13 @@
   background-image:url("/system/themes/flexible/icons/stop.svg");
   background-size: 16px;
 }
+
+.tl_header {
+  &.hover-div {
+    &::after {
+      content: " ";
+      clear: right;
+      display: block;
+    }
+  }
+}