Merge pull request #69 from swiftchase/master

Improved locale lookup via Accept-Language strategy
basz · Aug 19, 2015 · 7837559 · 7837559
2 parents 986835b + 392ec42
commit 7837559
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/SlmLocale/Strategy/HttpAcceptLanguageStrategy.php b/src/SlmLocale/Strategy/HttpAcceptLanguageStrategy.php
@@ -67,10 +67,10 @@ public function detect(LocaleEvent $event)
                     return $locale;
                 }
 
-                if (Locale::lookup($supported, $locale)) {
-                    return $locale;
+                if ($match = Locale::lookup($supported, $locale)) {
+                    return $match;
                 }
             }
         }
     }
-}
+}
diff --git a/tests/SlmLocaleTest/Strategy/HttpAcceptLanguageStrategyTest.php b/tests/SlmLocaleTest/Strategy/HttpAcceptLanguageStrategyTest.php
@@ -121,4 +121,24 @@ public function testSelectsOnlyLanguageFromSupportedList()
         $locale = $strategy->detect($event);
         $this->assertEquals('bar', $locale);
     }
+
+    public function testSelectsLanguageViaLocaleLookup()
+    {
+        $strategy = $this->strategy;
+        $event    = $this->event;
+
+        $header   = new AcceptLanguage;
+        $header->addLanguage('de-DE', 1);
+        $header->addLanguage('en-US', 0.8);
+        $header->addLanguage('en', 0.6);
+
+        $event->getRequest()
+            ->getHeaders()
+            ->addHeader($header);
+
+        $event->setSupported(array('en', 'de'));
+
+        $locale = $strategy->detect($event);
+        $this->assertEquals('de', $locale);
+    }    
 }