better factory configuration

zendframework · Jun 29, 2012 · 00fc0f4 · 00fc0f4
1 parent 7ebbd12
commit 00fc0f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php
@@ -74,15 +74,11 @@ public function load($filename, $locale)
 
         // Verify magic number
         $magic = fread($this->file, 4);
-        // 32-bit machine is little-endian
-        if (PHP_INT_SIZE < 8) {
-            $magic = strrev($magic);
-        }
 
-        if ($magic === "\x95\x04\x12\xde") {
-            $this->littleEndian = true;
-        } elseif ($magic === "\xde\x12\x04\x95") {
+        if ($magic == "\x95\x04\x12\xde") {
             $this->littleEndian = false;
+        } elseif ($magic == "\xde\x12\x04\x95") {
+            $this->littleEndian = true;
         } else {
             fclose($this->file);
             throw new Exception\InvalidArgumentException(sprintf(

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -111,10 +111,11 @@ public static function factory($options)
 
         // locales
         if (isset($options['locale'])) {
-            $translator->setLocale($options['locale']);
-        }
-        if (isset($options['fallback_locale'])) {
-            $translator->setFallbackLocale($options['fallback_locale']);
+            $locales = (array) $options['locale'];
+            $translator->setLocale(array_shift($locales));
+            if (count($locales) > 0) {
+                $translator->setFallbackLocale(array_shift($locales));
+            }
         }
 
         // patterns