Merge branch 'feature/3559' into develop

Close zendframework#3559
HolgerW1 · Jan 25, 2013 · 8b1a5d5 · 8b1a5d5
2 parents 303eee7 + 675397a
commit 8b1a5d5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/library/Zend/View/Helper/FlashMessenger.php b/library/Zend/View/Helper/FlashMessenger.php
@@ -14,11 +14,12 @@
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\Helper\AbstractHelper;
 use Zend\View\Helper\EscapeHtml;
+use Zend\I18n\View\Helper\AbstractTranslatorHelper;
 
 /**
  * Helper to proxy the plugin flash messenger
  */
-class FlashMessenger extends AbstractHelper implements ServiceLocatorAwareInterface
+class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorAwareInterface
 {
     /**
      * @var ServiceLocatorInterface
@@ -102,6 +103,11 @@ public function render($namespace = null, array $classes = array())
         $escapeHtml      = $this->getEscapeHtmlHelper();
         $messagesToPrint = array();
         array_walk_recursive($messages, function($item) use (&$messagesToPrint, $escapeHtml) {
+            if (($translator = $this->getTranslator()) !== null) {
+                $item = $translator->translate(
+                        $item, $this->getTranslatorTextDomain()
+                );
+            }
             $messagesToPrint[] = $escapeHtml($item);
         });
 

diff --git a/tests/ZendTest/View/Helper/FlashMessengerTest.php b/tests/ZendTest/View/Helper/FlashMessengerTest.php
@@ -173,4 +173,21 @@ public function testCanDisplayListOfMessagesCustomisedByConfig()
         $displayInfo = $helper->render(PluginFlashMessenger::NAMESPACE_INFO);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
+
+    public function testCanTranslateMessages()
+    {
+        $mockTranslator = $this->getMock('Zend\I18n\Translator\Translator');
+        $mockTranslator->expects($this->exactly(1))
+        ->method('translate')
+        ->will($this->returnValue('translated message'));
+
+        $this->helper->setTranslator($mockTranslator);
+        $this->assertTrue($this->helper->hasTranslator());
+
+        $this->seedMessages();
+
+        $displayAssertion = '<ul class="info"><li>translated message</li></ul>';
+        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $this->assertEquals($displayAssertion, $display);
+    }
 }
diff --git a/tests/ZendTest/View/PhpRendererTest.php b/tests/ZendTest/View/PhpRendererTest.php
@@ -340,8 +340,12 @@ public function testRendererRaisesExceptionInCaseOfExceptionInView()
         $model = new ViewModel();
         $model->setTemplate('exception');
 
-        $this->setExpectedException('Exception', 'thrown from view script');
-        $this->renderer->render($model);
+        try {
+            $this->renderer->render($model);
+            $this->fail('Exception from renderer should propagate');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Exception', $e);
+        }
     }
 
     public function testRendererRaisesExceptionIfResolverCannotResolveTemplate()