Update Translatable.php

Author: sertxudev

src/Translatable.php

@@ -2,11 +2,7 @@
 
 namespace SertxuDeveloper\Translatable;
 
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\URL;
 
 class Translatable {
@@ -16,35 +12,23 @@ public function checkLocaleInSupportedLocales($locale) {
     return in_array($locale, $locales);
   }
 
-  public function isFallbackLocaleHidden() {
-    return config('translatable.hide_fallback_locale');
+  public function getLocaleFromRequest() {
+    $params = explode('/', request()->getPathInfo());
+    // Dump the first element (empty string) as getPathInfo() always returns a leading slash
+    array_shift($params);
+    if (\count($params) > 0) {
+      $locale = $params[0];
+      if ($this->checkLocaleInSupportedLocales($locale)) return $locale;
+    }
+    return config('translatable.fallback_locale');
   }
 
   public function isFallbackLocale($locale) {
     return config('translatable.fallback_locale') === $locale;
   }
 
-  public function switchToLocale($locale) {
-    $request = request();
-    $params = explode('/', $request->getPathInfo());
-    // Dump the first element (empty string) as getPathInfo() always returns a leading slash
-    array_shift($params);
-    if (\count($params) > 0) {
-      if ($this->checkLocaleInSupportedLocales($locale)) {
-        if ($this->checkLocaleInSupportedLocales($params[0])) array_shift($params);
-        $params = implode('/', $params);
-        if ($this->isFallbackLocaleHidden() && $this->isFallbackLocale($locale)) {
-          $url = $params;
-        } else {
-          $url = $locale . '/' . $params;
-        }
-      }
-    } else {
-      $url = '';
-    }
-
-    $url = $url = $request->root() . "/${url}";
-    return $url;
+  public function isFallbackLocaleHidden() {
+    return config('translatable.hide_fallback_locale');
   }
 
   public function route($name, $parameters = [], $absolute = false, $locale = null) {
@@ -61,30 +45,46 @@ public function route($name, $parameters = [], $absolute = false, $locale = null
       $url = URL::route($name, $parameters, $absolute);
     } else {
       $params = explode('/', $name);
-      if ($params[0] == null) array_shift($params);
+      if ($params[0] == null)
+        array_shift($params);
+
       if (\count($params) > 0) {
-        if ($this->checkLocaleInSupportedLocales($params[0])) array_shift($params);
+        if ($this->checkLocaleInSupportedLocales($params[0]))
+          array_shift($params);
+
         $params = implode('/', $params);
-        if ($this->isFallbackLocaleHidden() && $this->isFallbackLocale($locale)) {
-          $url = $params;
-        } else {
-          $url = "/$locale/$params";
-        }
+
+        if (!$this->isFallbackLocaleHidden() || !$this->isFallbackLocale($locale))
+          $params = "${locale}/${params}";
+
+        $url = URL::to($params);
       }
     }
-    
+
     return $url;
   }
 
-  public function getLocaleFromRequest() {
-    $params = explode('/', request()->getPathInfo());
+  public function switchToLocale($locale) {
+    $request = request();
+    $params = explode('/', $request->getPathInfo());
     // Dump the first element (empty string) as getPathInfo() always returns a leading slash
     array_shift($params);
     if (\count($params) > 0) {
-      $locale = $params[0];
-      if ($this->checkLocaleInSupportedLocales($locale)) return $locale;
+      if ($this->checkLocaleInSupportedLocales($locale)) {
+        if ($this->checkLocaleInSupportedLocales($params[0])) array_shift($params);
+        $params = implode('/', $params);
+        if ($this->isFallbackLocaleHidden() && $this->isFallbackLocale($locale)) {
+          $url = $params;
+        } else {
+          $url = $locale . '/' . $params;
+        }
+      }
+    } else {
+      $url = '';
     }
-    return config('translatable.fallback_locale');
+
+    $url = $url = $request->root() . "/${url}";
+    return $url;
   }
 
   /**