diff --git a/Controller/ApiController.php b/Controller/ApiController.php index e69389c..8baad61 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -324,7 +324,7 @@ final class ApiController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->addData('tcoll', $tcoll); - $view->addData('lang', $request->getData('lang') ?? $request->getLanguage()); + $view->addData('lang', $request->getData('lang') ?? $request->header->l11n->language); $view->addData('instance', $instance); $view->addData('template', $instance->template); $view->addData('basepath', __DIR__ . '/../../../'); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c0b15a4..968c554 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -58,7 +58,7 @@ final class BackendController extends Controller ->with('tags') ->with('tags/title') ->where('virtualPath', $path) - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->execute(); list($collection, $parent) = CollectionMapper::getCollectionsByPath($path); diff --git a/Theme/Backend/workflow-template.tpl.php b/Theme/Backend/workflow-template.tpl.php index 144f810..fd1d927 100755 --- a/Theme/Backend/workflow-template.tpl.php +++ b/Theme/Backend/workflow-template.tpl.php @@ -112,7 +112,7 @@ if (!empty($template->schema)) :
printHtml($action['name']); ?>
-
printHtml($action['description'][$this->request->getLanguage()]); ?>
+
printHtml($action['description'][$this->request->header->l11n->language]); ?>