Make I18n component completely optional for Mvc

library/Zend/Mvc/I18n/DummyTranslator.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\I18n;
+
+use Zend\Validator\Translator\TranslatorInterface as ValidatorTranslatorInterface;
+
+class DummyTranslator implements ValidatorTranslatorInterface
+{
+    public function translate($message, $textDomain = 'default', $locale = null)
+    {
+        return $message;
+    }
+}

library/Zend/Mvc/I18n/Translator.php

@@ -12,6 +12,23 @@
 use Zend\I18n\Translator\Translator as I18nTranslator;
 use Zend\Validator\Translator\TranslatorInterface as ValidatorTranslatorInterface;
 
-class Translator extends I18nTranslator implements ValidatorTranslatorInterface
+class Translator implements ValidatorTranslatorInterface
 {
+    /**
+     * @var I18nTranslator
+     */
+    protected $translator;
+
+    /**
+     * @param I18nTranslator $translator
+     */
+    public function __construct(I18nTranslator $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function translate($message, $textDomain = 'default', $locale = null)
+    {
+        return $this->translator->translate($message, $textDomain, $locale);
+    }
 }

library/Zend/Mvc/Service/TranslatorServiceFactory.php

@@ -9,22 +9,22 @@
 
 namespace Zend\Mvc\Service;
 
-use Zend\I18n\Translator\TranslatorServiceFactory as I18nTranslatorServiceFactory;
+use Zend\Mvc\I18n\DummyTranslator;
 use Zend\Mvc\I18n\Translator;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Overrides the translator factory from the i18n component in order to
  * replace it with the bridge class from this namespace.
  */
-class TranslatorServiceFactory extends I18nTranslatorServiceFactory
+class TranslatorServiceFactory
 {
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        // Configure the translator
-        $config     = $serviceLocator->get('Config');
-        $trConfig   = isset($config['translator']) ? $config['translator'] : array();
-        $translator = Translator::factory($trConfig);
-        return $translator;
+        if (!$serviceLocator->has('translator')) {
+            return new DummyTranslator();
+        }
+
+        return new Translator($serviceLocator->get('translator'));
     }
 }

library/Zend/View/HelperPluginManager.php

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