Translate full URI that contains a placeholder

Author: ivanvermeyen

src/Macros/UriTranslationMacro.php

@@ -18,10 +18,10 @@ public static function register()
         Lang::macro('uri', function ($uri, $locale = null, $namespace = null) {
 
             // Attempt to translate full uri.
-            if (!Str::contains($uri, '{') && Lang::has(($namespace ? $namespace.'::' : '')."routes.$uri", $locale)) {
+            if (Lang::has(($namespace ? $namespace.'::' : '')."routes.$uri", $locale)) {
                 return Lang::get(($namespace ? $namespace.'::' : '')."routes.$uri", [], $locale);
             }
-            
+
             // Split the URI into a Collection of segments.
             $segments = new Collection(explode('/', trim($uri, '/')));
 

tests/Unit/Macros/UriTranslationMacroTest.php

@@ -93,6 +93,20 @@ public function you_can_translate_a_full_uri()
         $this->assertEquals('producten/glazen', Lang::uri('products/glass', 'nl'));
     }
 
+    /** @test */
+    public function you_can_translate_a_full_uri_with_placeholder()
+    {
+        $this->setTranslations([
+            'nl' => [
+                'glass'                => 'glas',
+                'products'             => 'producten',
+                'products/glass/{type}' => 'producten/glazen/{type}'
+            ]
+        ]);
+
+        $this->assertEquals('producten/glazen/{type}', Lang::uri('products/glass/{type}', 'nl'));
+    }
+
     /** @test */
     public function you_can_specify_a_namespace()
     {