fix locale selection, updated dependencies

symfony-cmf · Sep 9, 2014 · 87bb2a5 · 87bb2a5
1 parent 171f8f1
commit 87bb2a5
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 78 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -275,8 +275,8 @@ cmf_search:
 lunetics_locale:
     strict_mode: true
     guessing_order:
-        - cookie
         - router
+        - cookie
         - browser
     allowed_locales: %locales%
 

diff --git a/app/tests/StaticPageTest.php b/app/tests/StaticPageTest.php
@@ -21,10 +21,15 @@ public function testContent($url, $title)
     public function contentDataProvider()
     {
         return array(
+            array('/en', 'Homepage'),
+            array('/fr', 'Page principale'),
+            array('/de', 'Startseite'),
             array('/en/projects', 'The projects'),
             array('/en/projects/cmf', 'Content Management Framework'),
             array('/en/company', 'The Company'),
             array('/en/company/team', 'The Team'),
+            array('/fr/company/team', 'The Team'),
+            array('/de/company/team', 'The Team'),
             array('/en/company/more', 'More Information'),
             array('/demo', 'Routing demo'),
             array('/demo/controller', 'Explicit Controller'),
@@ -39,7 +44,7 @@ public function contentDataProvider()
     public function testJson()
     {
         $client = $this->createClient();
-        $client->request('GET', '/de/company/team', array(), array(), array(
+        $client->request('GET', '/en/company/team', array(), array(), array(
                 'HTTP_ACCEPT'  => 'application/json',
             )
         );