Merge pull request #1315 from m038/CS-5931-hack2

CS-5931: connects symfony locale to legacy locale
sourcefabric · Jan 12, 2016 · bc9b61c · bc9b61c
2 parents 35be712 + 91d23b5
commit bc9b61c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/newscoop/application/controllers/helpers/Smarty.php b/newscoop/application/controllers/helpers/Smarty.php
@@ -24,6 +24,13 @@ public function preDispatch()
 
         $request = $this->getRequest();
 
+        if ($request->getParam('language') == false) {
+            $locale = \Zend_Controller_Front::getInstance()->getParam('locale');
+            if (!empty($locale)) {
+                $request->setParam('language', $locale);
+            }
+        }
+
         $format = $request->getParam('format', null);
         if (isset($format) && $format == "json") {
             return;

diff --git a/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php b/newscoop/src/Newscoop/ZendBridgeBundle/Controller/BridgeController.php
@@ -60,6 +60,7 @@ public function indexAction(Request $request)
         }
 
         $front->setParam('bootstrap', $bootstrap);
+        $front->setParam('locale', $request->getLocale());
         $front->setBaseUrl('/');
         $response = $front->dispatch();