Fix translation warning when no route prefix is defined or when the translation is a simple slash

Author: Jérôme Poskin

README.md

@@ -1,4 +1,4 @@
-SnowcapAdminBundle
+SnowcapI18nBundle
 ==================
 
 The SnowcapI18nBundle provides a set of tools and helpers for multi-locale websites.
@@ -8,9 +8,6 @@ Features include:
 - A @I18nRoute annotation to handle localized routes based on locale prefixes
 - A few twig functions and filters
 
-**Caution:** This bundle is developed in sync with [symfony's repository](https://github.com/symfony/symfony).
-For Symfony 2.2.x, you need to use the 2.2.x branch of the bundle.
-
 [![Build Status](https://secure.travis-ci.org/snowcap/SnowcapI18nBundle.png?branch=master)](http://travis-ci.org/snowcap/SnowcapI18nBundle)
 
 Documentation

Routing/I18nAnnotatedRouteControllerLoader.php

@@ -7,7 +7,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader;
 use Snowcap\I18nBundle\Registry;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Translation\TranslatorInterface;
 
 class I18nAnnotatedRouteControllerLoader extends AnnotatedRouteControllerLoader {
     /**
@@ -67,19 +66,19 @@ protected function addRoute(
 
         foreach($this->registry->getRegisteredLocales() as $locale) {
             $i18nAnnot = new Route($annot->data);
-            $i18nGlobals = $globals;
 
             if($i18n) {
                 $i18nAnnot->setName($this->helper->alterName($i18nAnnot->getName(), $locale));
                 $i18nAnnot->setPath($this->helper->alterPath($i18nAnnot->getPath(), $locale));
                 $i18nAnnot->setDefaults($this->helper->alterdefaults($i18nAnnot->getDefaults(), $locale));
 
-                $i18nGlobals['path'] = $this->helper->alterPath($i18nGlobals['path'], $locale);
-
-                $i18nGlobals['path'] = rtrim('/' . $locale . '/' . ltrim($i18nGlobals['path'], '/'), '/');
+                if (isset($globals['path']) && !empty($globals['path'])) {
+                    $globals['path'] = $this->helper->alterPath($globals['path'], $locale);
+                    $globals['path'] = rtrim('/' . $locale . '/' . ltrim($globals['path'], '/'), '/');
+                }
             }
 
-            parent::addRoute($collection, $i18nAnnot, $i18nGlobals, $class, $method);
+            parent::addRoute($collection, $i18nAnnot, $globals, $class, $method);
         }
     }
 }

Routing/I18nLoaderHelper.php

@@ -17,6 +17,7 @@ class I18nLoaderHelper {
 
     /**
      * @param TranslatorInterface $translator
+     * @param string $translationDomain
      */
     public function __construct(TranslatorInterface $translator, $translationDomain)
     {
@@ -35,15 +36,15 @@ public function alterName($name, $locale)
     }
 
     /**
-     * @param $path
-     * @param $locale
+     * @param string $path
+     * @param string $locale
      * @return string
      */
     public function alterPath($path, $locale)
     {
-        $translatedPath = trim($this->translator->trans($path, array(), $this->translationDomain, $locale), '/');
+        $translatedPath = $this->translator->trans($path, array(), $this->translationDomain, $locale);
 
-        return rtrim('/' . $translatedPath, '/');
+        return '/' . trim( $translatedPath, '/');
     }
 
     /**