Merge branch 'hotfix/translation-caching-broken' of https://github.co…

…m/demiankatz/zf2

src/Translator/Translator.php

@@ -446,7 +446,7 @@ protected function loadMessages($textDomain, $locale)
         if (null !== ($cache = $this->getCache())) {
             $cacheId = 'Zend_I18n_Translator_Messages_' . md5($textDomain . $locale);
 
-            if (false !== ($result = $cache->getItem($cacheId))) {
+            if (null !== ($result = $cache->getItem($cacheId))) {
                 $this->messages[$textDomain][$locale] = $result;
                 return;
             }

test/Translator/TranslatorTest.php

@@ -112,6 +112,20 @@ public function testTranslate()
         $this->assertEquals('bar', $this->translator->translate('foo'));
     }
 
+
+    public function testTranslateWithCache()
+    {
+        $cache = \Zend\Cache\StorageFactory::factory(array('adapter' => 'memory'));
+        $this->translator->setCache($cache);
+
+        $loader = new TestLoader();
+        $loader->textDomain = new TextDomain(array('foo' => 'bar'));
+        $this->translator->getPluginManager()->setService('test', $loader);
+        $this->translator->addTranslationFile('test', null);
+
+        $this->assertEquals('bar', $this->translator->translate('foo'));
+    }
+
     public function testTranslatePlurals()
     {
         $this->translator->setLocale('en_EN');