From 9445aa43e68a100399590c3392f494013cc2e2e3 Mon Sep 17 00:00:00 2001
From: Benny <Sommerregen@users.noreply.github.com>
Date: Thu, 29 Oct 2015 13:44:29 +0100
Subject: [PATCH] Fix #395 (Problem with default language and slugs that is
 starting with language name)

---
 system/src/Grav/Common/Language/Language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index 4f6718836..5dfe343f2 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -162,7 +162,7 @@ class Language
      */
     public function setActiveFromUri($uri)
     {
-        $regex = '/(^\/(' . $this->getAvailable() . ')).*/';
+        $regex = '/(^\/(' . $this->getAvailable() . '))(?:\/.*|$)/i';
 
         // if languages set
         if ($this->enabled()) {