Merge branch 'master' into 2.0

pmaxs · Aug 29, 2016 · 0e371ca · 0e371ca
2 parents 0ece399 + 91f988a
commit 0e371ca
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/src/EventListener/LocaleListener.php b/src/EventListener/LocaleListener.php
@@ -147,9 +147,14 @@ protected function getExcludeRoutesReg()
 
         if (isset($exclude_routes_reg)) return $exclude_routes_reg;
 
-        $exclude_routes_reg = implode('|', $this->exclude_routes);
-        $exclude_routes_reg = str_replace('~', '\\~', $exclude_routes_reg);
-        $exclude_routes_reg = '~' . $exclude_routes_reg . '~';
+        if (!empty($this->exclude_routes)) {
+            $exclude_routes_reg = implode('|', $this->exclude_routes);
+            $exclude_routes_reg = str_replace('~', '\\~', $exclude_routes_reg);
+            $exclude_routes_reg = '~' . $exclude_routes_reg . '~';
+        } else {
+            $exclude_routes_reg = false;
+        }
+
 
         return $exclude_routes_reg;
     }

diff --git a/src/Twig/LocaleExtension.php b/src/Twig/LocaleExtension.php
@@ -37,11 +37,12 @@ public function __construct(UrlGenerator $generator, $locales)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('generate', [$this, 'generate']),
+            new \Twig_SimpleFunction('locale_generate', [$this, 'generate']),
             new \Twig_SimpleFunction('locale_get_url', [$this, 'getUrl']),
             new \Twig_SimpleFunction('locale_get_url_for_locale', [$this, 'getUrlForLocale']),
             new \Twig_SimpleFunction('locale_get_index_url', [$this, 'getIndexUrl']),
             new \Twig_SimpleFunction('locale_get_index_url_for_locale', [$this, 'getIndexUrlForLocale']),
+            new \Twig_SimpleFunction('locale_clear_path_from_locale', [$this, 'clearPathFromLocale']),
         ];
     }
 
@@ -102,6 +103,16 @@ public function getIndexUrlForLocale($locale, $absolute = false)
         return $this->generator->getIndexUrlForLocale($locale, $absolute);
     }
 
+    /**
+     * Clear path from locale
+     * @param $path
+     * @return string
+     */
+    public function clearPathFromLocale($path)
+    {
+        return $this->generator->clearPathFromLocale($path);
+    }
+
     /**
      * @inheritdoc
      */

diff --git a/src/Utils/UrlGenerator.php b/src/Utils/UrlGenerator.php
@@ -159,6 +159,22 @@ public function getIndexUrlForLocale($locale, $absolute = false)
         }
     }
 
+    /**
+     * Clear path from locale
+     * @param $path
+     * @return string
+     */
+    public function clearPathFromLocale($path)
+    {
+        if ($this->resolve_by_host) {
+            return $path;
+        }
+
+        $path = preg_replace('~^/?(' . $this->getLocalesReg() . ')(/|$)~', '', $path);
+
+        return $path;
+    }
+
     /**
      * Return scheme
      * @return string