Fix issue on hidden locale clash when first segment is dynamic

thinktomorrow · Nov 2, 2016 · f2e1327 · f2e1327
1 parent 94aa51f
commit f2e1327
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Thinktomorrow/Locale/Locale.php b/src/Thinktomorrow/Locale/Locale.php
@@ -67,6 +67,9 @@ public function getSlug($locale = null)
      */
     public function isHidden($locale = null)
     {
+        // If a specific locale string is passed we first validate it represents a valid locale
+        if($locale && !$this->validateLocale($locale)) return false;
+
         $locale = $this->validateLocale($locale) ? $locale : $this->get();
 
         return ($this->hidden_locale == $locale);

diff --git a/tests/LocaleUrlTest.php b/tests/LocaleUrlTest.php
@@ -125,4 +125,23 @@ public function it_can_create_a_named_route_with_multiple_segments()
         $this->assertEquals('http://example.be/nl/blue/foo/bar?dazzle=awesome&crazy=vibe', LocaleUrl::route('foo.show',['color' => 'blue','dazzle' => 'awesome','crazy' => 'vibe']));
     }
 
+    /** @test */
+    public function it_can_create_a_named_route_with_multiple_segments_for_hidden_locale()
+    {
+        app()->bind('Thinktomorrow\Locale\Locale', function ($app) {
+            return new Locale($app['request'], [
+                'available_locales' => ['nl', 'fr'],
+                'fallback_locale' => null,
+                'hidden_locale' => 'nl'
+            ]);
+        });
+
+        Route::get('{color}/foo/bar',['as' => 'foo.show','uses' => function(){}]);
+
+        app()->setLocale('nl');
+        $this->assertEquals('http://example.be/blue/foo/bar?dazzle=awesome&crazy=vibe', LocaleUrl::route('foo.show',['color' => 'blue','dazzle' => 'awesome','crazy' => 'vibe']));
+    }
+
+
+
 }