[MERGE] Branch 'master' of https://github.com/cjel/typo3-templates_aide

Classes/Controller/ActionController.php

@@ -370,13 +370,23 @@ class ActionController extends BaseController
      */
     protected function getTranslation($key, $arguments = null)
     {
-        return LocalizationUtility::translate(
+        $translation = LocalizationUtility::translate(
             $key,
-            GeneralUtility::camelCaseToLowerCaseUnderscored(
+            $this->getExtensionKey(),
-                $this->extensionName
-            ),
             $arguments
         );
+        if ($translation) {
+            return $translation;
+        }
+        $translation = LocalizationUtility::translate(
+            $key,
+            'site_templates',
+            $arguments
+        );
+        if ($translation) {
+            return $translation;
+        }
+        return null;
     }
 
     /**