diff --git a/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php b/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
index c75efbdda8..647d4c876e 100644
--- a/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
+++ b/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
@@ -39,10 +39,6 @@ class ZendExtension extends Extension
if (isset($config['logger'])) {
$this->registerLoggerConfiguration($config, $container);
}
-
- if (isset($config['translator'])) {
- $this->registerTranslatorConfiguration($config, $container);
- }
}
/**
@@ -84,44 +80,6 @@ class ZendExtension extends Extension
}
}
- /**
- * Loads the translator configuration.
- *
- * Usage example:
- *
- *
- *
- * @param array $config An array of configuration settings
- * @param ContainerBuilder $container A ContainerBuilder instance
- */
- protected function registerTranslatorConfiguration($config, ContainerBuilder $container)
- {
- $config = $config['translator'];
-
- if (!$container->hasDefinition('zend.translator')) {
- $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
- $loader->load('translator.xml');
- $container->setAlias('translator', 'zend.translator');
- }
-
- if (isset($config['locale'])) {
- $container->setParameter('zend.translator.locale', $config['locale']);
- }
-
- if (isset($config['adapter'])) {
- $container->setParameter('zend.translator.adapter', $config['adapter']);
- }
-
- if (isset($config['translation']) && is_array($config['translation'])) {
- foreach ($config['translation'] as $locale => $catalogue) {
- if ($locale == $container->getParameter('zend.translator.locale')) {
- $container->setParameter('zend.translator.catalogue', $catalogue);
- }
- $container->findDefinition('zend.translator')->addMethodCall('addTranslation', array($catalogue, $locale));
- }
- }
- }
-
/**
* Returns the base path for the XSD files.
*
diff --git a/src/Symfony/Bundle/ZendBundle/Resources/config/schema/zend-1.0.xsd b/src/Symfony/Bundle/ZendBundle/Resources/config/schema/zend-1.0.xsd
index a32a03a76b..29a074fc1c 100644
--- a/src/Symfony/Bundle/ZendBundle/Resources/config/schema/zend-1.0.xsd
+++ b/src/Symfony/Bundle/ZendBundle/Resources/config/schema/zend-1.0.xsd
@@ -10,7 +10,6 @@
-
@@ -40,17 +39,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Symfony/Bundle/ZendBundle/Resources/config/translator.xml b/src/Symfony/Bundle/ZendBundle/Resources/config/translator.xml
deleted file mode 100755
index 062f77a12c..0000000000
--- a/src/Symfony/Bundle/ZendBundle/Resources/config/translator.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- Zend\Translator\Translator
- Zend\Translator\Translator::AN_ARRAY
- null
- en
-
-
-
-
- %zend.translator.adapter%
- %zend.translator.catalogue%
- %zend.translator.locale%
-
-
-
-
-
-
diff --git a/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php b/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php
index 25505340c7..7c1477bb3f 100644
--- a/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php
+++ b/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php
@@ -28,13 +28,5 @@ class ZendExtensionTest extends TestCase
$loader->configLoad(array('logger' => array('priority' => 3)), $container);
$this->assertEquals(3, $container->getParameter('zend.logger.priority'), '->loggerLoad() overrides existing configuration options');
-
- // translator
- $loader->configLoad(array('translator' => array()), $container);
- $this->assertEquals('Zend\\Translator\\Translator', $container->getParameter('zend.translator.class'), '->i18nLoad() loads the translator.xml file if not already loaded');
-
- $loader->configLoad(array('translator' => array('adapter' => 'Zend\\Translator\\Translator::AN_XLIFF', 'locale' => 'fr')), $container);
- $this->assertEquals('Zend\\Translator\\Translator::AN_XLIFF', $container->getParameter('zend.translator.adapter'), '->i18nLoad() overrides existing configuration options');
- $this->assertEquals('fr', $container->getParameter('zend.translator.locale'), '->i18nLoad() overrides existing configuration options');
}
}