Merge tag v2.3.25 into develop

roadiz · Aug 26, 2024 · f9dd806 · f9dd806
1 parent 8939cf3
commit f9dd806
Showing 1 changed file with 9 additions and 0 deletions.
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
          */