From cbae19302d9d77e8d5bdb7a0534ae0d6a2a047b9 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.de>
Date: Mon, 5 Apr 2021 23:52:33 +0200
Subject: [PATCH 1/2] [TASK] Fix error translation handling

---
 Classes/Controller/ActionController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Classes/Controller/ActionController.php b/Classes/Controller/ActionController.php
index 8c633c1..cc8dbab 100644
--- a/Classes/Controller/ActionController.php
+++ b/Classes/Controller/ActionController.php
@@ -354,9 +354,7 @@ class ActionController extends BaseController
     {
         return LocalizationUtility::translate(
             $key,
-            GeneralUtility::camelCaseToLowerCaseUnderscored(
-                $this->extensionName
-            ),
+            $this->getExtensionKey(),
             $arguments
         );
     }

From 09d69397c893196503eca8bfd24b6627b07c59b7 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.de>
Date: Thu, 8 Apr 2021 18:40:32 +0200
Subject: [PATCH 2/2] [TASK] Try to get translation from site_templates

---
 Classes/Controller/ActionController.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Classes/Controller/ActionController.php b/Classes/Controller/ActionController.php
index cc8dbab..2c339a6 100644
--- a/Classes/Controller/ActionController.php
+++ b/Classes/Controller/ActionController.php
@@ -352,11 +352,23 @@ class ActionController extends BaseController
      */
     protected function getTranslation($key, $arguments = null)
     {
-        return LocalizationUtility::translate(
+        $translation = LocalizationUtility::translate(
             $key,
             $this->getExtensionKey(),
             $arguments
         );
+        if ($translation) {
+            return $translation;
+        }
+        $translation = LocalizationUtility::translate(
+            $key,
+            'site_templates',
+            $arguments
+        );
+        if ($translation) {
+            return $translation;
+        }
+        return null;
     }
 
     /**