From 2f9621ac0f6bc212e67bc2c178255b15e7fd5685 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 22 Oct 2015 15:53:42 -0600
Subject: [PATCH] Remove language for ALL urls where it's not needed (outside
 of pages/ for now)

---
 admin.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin.php b/admin.php
index c4f089a4..8b20dce6 100644
--- a/admin.php
+++ b/admin.php
@@ -3,6 +3,7 @@ namespace Grav\Plugin;
 
 use Grav\Common\GPM\GPM;
 use Grav\Common\Grav;
+use Grav\Common\Language\Language;
 use Grav\Common\Page\Page;
 use Grav\Common\Page\Pages;
 use Grav\Common\Plugin;
@@ -345,8 +346,6 @@ class AdminPlugin extends Plugin
             }
         }
 
-
-
         // Decide admin template and route.
         $path = trim(substr($this->uri->route(), strlen($this->base)), '/');
         $this->template = 'dashboard';
@@ -357,6 +356,13 @@ class AdminPlugin extends Plugin
             $this->route = array_shift($array);
         }
 
+        /** @var Language $language */
+        $require_language = ['pages', 'translations'];
+        $language = $this->grav['language'];
+        if ($language->isLanguageInUrl() && !in_array($this->template, $require_language)) {
+            $this->grav->redirect($this->uri->route());
+        }
+
         // Initialize admin class.
         require_once __DIR__ . '/classes/admin.php';
         $this->admin = new Admin($this->grav, $this->base, $this->template, $this->route);