Merge branch hotfix/v2.3.25

roadiz · Aug 26, 2024 · 4f01c88 · 4f01c88
1 parent 63c6295
commit 4f01c88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config/services.yaml b/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.24'
+    roadiz_core.cms_version: '2.3.25'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/src/Api/Controller/GetWebResponseByPathController.php b/src/Api/Controller/GetWebResponseByPathController.php
@@ -134,6 +134,15 @@ protected function normalizeResourcePath(?Request $request, string $path): Persi
 
         $this->addResourceToCacheTags($request, $resource);
 
+        // Set translation and locale to be used in Request context
+        if (null !== $resourceInfo->getTranslation()) {
+            $request->attributes->set('_translation', $resourceInfo->getTranslation());
+        }
+
+        if (null !== $resourceInfo->getLocale()) {
+            $request->attributes->set('_locale', $resourceInfo->getLocale());
+        }
+
         /*
          * Or plain entity
          */