Remove bundle and related locale routing code which is not used anymore.

wolfwolker · Jul 2, 2012 · 01a0992 · 01a0992
1 parent 0bdb00c
commit 01a0992
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 206 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -29,7 +29,6 @@ public function registerBundles()
             new Knp\Bundle\DisqusBundle\KnpDisqusBundle(),
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new Ornicar\GravatarBundle\OrnicarGravatarBundle(),
-            new JMS\I18nRoutingBundle\JMSI18nRoutingBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
             new Nelmio\SolariumBundle\NelmioSolariumBundle(),
 

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -61,11 +61,6 @@ doctrine:
                 mappings:
                   KnpBundlesBundle: ~
 
-jms_i18n_routing:
-    default_locale: en
-    locales: [fr, pl, en]
-    strategy: prefix_except_default
-
 inori_twitter_app:
     file: %kernel.root_dir%/../vendor/twitteroauth/twitteroauth/twitteroauth.php
     consumer_key: %knp_bundles.twitter.consumer_key%
@@ -123,4 +118,4 @@ nelmio_solarium:
         class: Solarium_Client_Adapter_Http
         host: %solarium.host%
         port: %solarium.port%
-        path: %solarium.path%
+        path: %solarium.path%
diff --git a/composer.json b/composer.json
@@ -12,7 +12,6 @@
         "symfony/assetic-bundle": "*",
         "symfony/monolog-bundle": "*",
         "sensio/distribution-bundle": "*",
-        "jms/i18n-routing-bundle": "*",
         "doctrine/doctrine-fixtures-bundle": "*",
         "doctrine/doctrine-migrations-bundle": "*",
         "stof/doctrine-extensions-bundle": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/config/twig.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/config/twig.yml
@@ -1,15 +1,10 @@
 services:
-    twig.extension.knp.locale_routing:
-        class: Knp\Bundle\KnpBundlesBundle\Twig\Extension\LocaleRoutingTwigExtension
-        tags:
-            - { name: twig.extension }
-        arguments:
-            - @router
     twig.extension.knp.flawored_markdown:
         class: Knp\Bundle\KnpBundlesBundle\Twig\Extension\FlaworedMarkdownTwigExtension
         tags:
             - { name: twig.extension }
+
     twig.extension.knp.bundle_activity:
         class: Knp\Bundle\KnpBundlesBundle\Twig\Extension\BundleActivityTwigExtension
         tags:
-            - { name: twig.extension }        
+            - { name: twig.extension }
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.en.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.en.yml
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.fr.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.fr.yml
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.pl.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/routes.pl.yml
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Twig/Extension/LocaleRoutingTwigExtension.php b/src/Knp/Bundle/KnpBundlesBundle/Twig/Extension/LocaleRoutingTwigExtension.php