fixed #170 and #171

mcamara · Feb 10, 2015 · 5af9bc3 · 5af9bc3
1 parent 88772e7
commit 5af9bc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["localization", "laravel", "php"],
     "homepage": "https://github.com/mcamara/laravel-localization",
     "license": "MIT",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "authors": [
         {
             "name": "Marc Cámara",

diff --git a/src/Mcamara/LaravelLocalization/LanguageNegotiator.php b/src/Mcamara/LaravelLocalization/LanguageNegotiator.php
@@ -1,7 +1,4 @@
-<?php
-
-namespace Mcamara\LaravelLocalization;
-
+<?php namespace Mcamara\LaravelLocalization;
 
 use Locale;
 use Illuminate\Http\Request;

diff --git a/src/Mcamara/LaravelLocalization/LaravelLocalization.php b/src/Mcamara/LaravelLocalization/LaravelLocalization.php
@@ -654,6 +654,8 @@ public function transRoute( $routeName )
      */
     public function getRouteNameFromAPath( $path )
     {
+        $attributes = $this->extractAttributes($path);
+
         $path = str_replace(url(), "", $path);
         if ( $path[ 0 ] !== '/' )
         {
@@ -664,12 +666,11 @@ public function getRouteNameFromAPath( $path )
 
         foreach ( $this->translatedRoutes as $route )
         {
-            if ( $this->translator->trans($route) == $path )
+            if ( $this->substituteAttributesInRoute( $attributes, $this->translator->trans($route)) === $path )
             {
                 return $route;
             }
         }
-
         return false;
     }