noopable · July 18, 2012 10:20 · Jul 11, 2012 · Jul 11, 2012 · Jul 11, 2012 · Jul 11, 2012
diff --git a/Module.php b/Module.php
@@ -11,7 +11,7 @@ class Module implements
     public function onBootstrap(Event $e)
     {
         $default   = 'nl';
-        $supported = array('de', 'de-DE');
+        $supported = array('en', 'en-GB');
         $app       = $e->getApplication();
         $headers   = $app->getRequest()->getHeaders();
 
@@ -20,14 +20,13 @@ public function onBootstrap(Event $e)
 
             // Loop through all locales, highest priority first
             foreach ($locales as $locale) {
-                $match = Locale::lookup($supported, $locale);
-                if ($match !== "") {
+                if (!!($match = Locale::lookup($supported, $locale))) {
                     // The locale is one of our supported list
                     Locale::setDefault($match);
                     break;
                 }
             }
-            if ($match === "") {
+            if (!$match) {
                 // Nothing from the supported list is a match
                 Locale::setDefault($default);
             }

diff --git a/Module.php b/Module.php
@@ -10,15 +10,27 @@ class Module implements
 {
     public function onBootstrap(Event $e)
     {
-        $default   = 'en';
-        $supported = array('en', 'nl');
+        $default   = 'nl';
+        $supported = array('de', 'de-DE');
         $app       = $e->getApplication();
         $headers   = $app->getRequest()->getHeaders();
 
         if ($headers->has('Accept-Language')) {
-            $header = $headers->get('Accept-Language')->getFieldValue();
-            $locale = Locale::lookup($supported, $header, false, $default);
-            Locale::setDefault($locale);
+            $locales = $headers->get('Accept-Language')->getPrioritized();
+
+            // Loop through all locales, highest priority first
+            foreach ($locales as $locale) {
+                $match = Locale::lookup($supported, $locale);
+                if ($match !== "") {
+                    // The locale is one of our supported list
+                    Locale::setDefault($match);
+                    break;
+                }
+            }
+            if ($match === "") {
+                // Nothing from the supported list is a match
+                Locale::setDefault($default);
+            }
         } else {
             Locale::setDefault($default);
         }

diff --git a/Module.php b/Module.php
@@ -17,7 +17,7 @@ public function onBootstrap(Event $e)
 
         if ($headers->has('Accept-Language')) {
             $header = $headers->get('Accept-Language')->getFieldValue();
-            $locale = Locale::lookup($supported, $header, $default);
+            $locale = Locale::lookup($supported, $header, false, $default);
             Locale::setDefault($locale);
         } else {
             Locale::setDefault($default);

diff --git a/Module.php b/Module.php
@@ -2,7 +2,7 @@
 namespace Application;
 
 use Locale;
-use Zend\EventManager\EventInterface;
+use Zend\EventManager\Event;
 use Zend\ModuleManager\Feature;
 
 class Module implements

diff --git a/Module.php b/Module.php
@@ -1,6 +1,8 @@
 <?php
 namespace Application;
 
+use Locale;
+use Zend\EventManager\EventInterface;
 use Zend\ModuleManager\Feature;
 
 class Module implements

diff --git a/Module.php b/Module.php
@@ -8,8 +8,8 @@ class Module implements
 {
     public function onBootstrap(Event $e)
     {
-        $default   = 'en_US';
-        $supported = array('en_US', 'de_DE', 'nl_NL');
+        $default   = 'en';
+        $supported = array('en', 'nl');
         $app       = $e->getApplication();
         $headers   = $app->getRequest()->getHeaders();
 
@@ -19,7 +19,6 @@ public function onBootstrap(Event $e)
             Locale::setDefault($locale);
         } else {
             Locale::setDefault($default);
-
         }
     }
 }
diff --git a/Module.php b/Module.php
@@ -14,11 +14,12 @@ public function onBootstrap(Event $e)
         $headers   = $app->getRequest()->getHeaders();
 
         if ($headers->has('Accept-Language')) {
-            Locale::setDefault($default);
-        } else {
             $header = $headers->get('Accept-Language')->getFieldValue();
             $locale = Locale::lookup($supported, $header, $default);
             Locale::setDefault($locale);
+        } else {
+            Locale::setDefault($default);
+
         }
     }
 }
diff --git a/Module.php b/Module.php
@@ -10,11 +10,8 @@ public function onBootstrap(Event $e)
     {
         $default   = 'en_US';
         $supported = array('en_US', 'de_DE', 'nl_NL');
-
-        $app = $e->getApplication();
-        $sm  = $app->getServiceManager();
-
-        $headers = $app->getRequest()->getHeaders();
+        $app       = $e->getApplication();
+        $headers   = $app->getRequest()->getHeaders();
 
         if ($headers->has('Accept-Language')) {
             Locale::setDefault($default);

diff --git a/Module.php b/Module.php
@@ -1,3 +1,4 @@
+<?php
 namespace Application;
 
 use Zend\ModuleManager\Feature;

diff --git a/Module.php b/Module.php
@@ -0,0 +1,26 @@
+namespace Application;
+
+use Zend\ModuleManager\Feature;
+
+class Module implements
+    Feature\BootstrapListenerInterface
+{
+    public function onBootstrap(Event $e)
+    {
+        $default   = 'en_US';
+        $supported = array('en_US', 'de_DE', 'nl_NL');
+
+        $app = $e->getApplication();
+        $sm  = $app->getServiceManager();
+
+        $headers = $app->getRequest()->getHeaders();
+
+        if ($headers->has('Accept-Language')) {
+            Locale::setDefault($default);
+        } else {
+            $header = $headers->get('Accept-Language')->getFieldValue();
+            $locale = Locale::lookup($supported, $header, $default);
+            Locale::setDefault($locale);
+        }
+    }
+}