Reverting commit a86e268 in routing SP.

This fixes #581
AsgardCms · Sep 5, 2018 · e50809d · e50809d
1 parent b4b952d
commit e50809d
Showing 1 changed file with 8 additions and 24 deletions.
diff --git a/Modules/Core/Providers/RoutingServiceProvider.php b/Modules/Core/Providers/RoutingServiceProvider.php
@@ -52,30 +52,14 @@ public function map(Router $router)
             $this->loadApiRoutes($router);
         });
 
-        $prefixes = $this->getPrefixes();
-        foreach ($prefixes as $prefix) {
-            $router->group([
-                'namespace' => $this->namespace,
-                'prefix' => $prefix,
-                'middleware' => ['localizationRedirect', 'web'],
-            ], function (Router $router) {
-                $this->loadBackendRoutes($router);
-                $this->loadFrontendRoutes($router);
-            });
-        }
-    }
-
-    /**
-     * Get locale prefixes
-     * @return array
-     */
-    private function getPrefixes()
-    {
-        if (app('asgard.isInstalled')) {
-            return array_merge(json_decode(setting('core::locales')), ['']);
-        }
-
-        return [LaravelLocalization::setLocale()];
+        $router->group([
+            'namespace' => $this->namespace,
+            'prefix' => LaravelLocalization::setLocale(),
+            'middleware' => ['localizationRedirect', 'web'],
+        ], function (Router $router) {
+            $this->loadBackendRoutes($router);
+            $this->loadFrontendRoutes($router);
+        });
     }
 
     /**