Merge branch 'hotfix/view-helper-translator' of https://github.com/we…

…ierophinney/zf2 into weierophinney-hotfix/view-helper-translator

src/HelperPluginManager.php

@@ -145,7 +145,9 @@ public function injectTranslator($helper)
     {
         if ($helper instanceof TranslatorAwareInterface) {
             $locator = $this->getServiceLocator();
-            if ($locator && $locator->has('translator')) {
+            if ($locator && $locator->has('MvcTranslator')) {
+                $helper->setTranslator($locator->get('MvcTranslator'));
+            } elseif ($locator && $locator->has('translator')) {
                 $helper->setTranslator($locator->get('translator'));
             }
         }

test/HelperPluginManagerTest.php

@@ -10,6 +10,8 @@
 
 namespace ZendTest\View;
 
+use Zend\I18n\Translator\Translator;
+use Zend\Mvc\I18n\Translator as MvcTranslator;
 use Zend\ServiceManager\ServiceManager;
 use Zend\View\HelperPluginManager;
 use Zend\View\Renderer\PhpRenderer;
@@ -80,4 +82,26 @@ public function testIdentityFactoryCanInjectAuthenticationServiceIfInParentServi
         $expected = $services->get('Zend\Authentication\AuthenticationService');
         $this->assertSame($expected, $identity->getAuthenticationService());
     }
+
+    public function testIfHelperIsTranslatorAwareAndMvcTranslatorIsAvailableItWillInjectTheMvcTranslator()
+    {
+        $translator = new MvcTranslator();
+        $services   = new ServiceManager();
+        $services->setService('MvcTranslator', $translator);
+        $this->helpers->setServiceLocator($services);
+
+        $helper = $this->helpers->get('HeadTitle');
+        $this->assertSame($translator, $helper->getTranslator());
+    }
+
+    public function testIfHelperIsTranslatorAwareAndMvcTranslatorIsUnavailableAndTranslatorIsAvailableItWillInjectTheTranslator()
+    {
+        $translator = new Translator();
+        $services   = new ServiceManager();
+        $services->setService('Translator', $translator);
+        $this->helpers->setServiceLocator($services);
+
+        $helper = $this->helpers->get('HeadTitle');
+        $this->assertSame($translator, $helper->getTranslator());
+    }
 }