Update Translatable.php

sertxudev · web-flow · commit 2630df33a5d1 · 2022-08-08T10:34:10.000+02:00
diff --git a/src/Translatable.php b/src/Translatable.php
@@ -33,10 +33,13 @@ public function getLocaleFromRequest(): string {
 
     if (count($params) > 0) {
       $locale = $params[0];
-      if ($this->checkLocaleInSupportedLocales($locale)) return $locale;
+
+      if ($this->checkLocaleInSupportedLocales($locale)) {
+          return $locale;
+      }
     }
 
-    return config('translatable.fallback_locale');
+    return app()->getLocale() ?? config('translatable.fallback_locale');
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,13 @@ public function getLocaleFromRequest(): string {`
`33`	`33`
`34`	`34`	`if (count($params) > 0) {`
`35`	`35`	`$locale = $params[0];`
`36`		`- if ($this->checkLocaleInSupportedLocales($locale)) return $locale;`
	`36`	`+`
	`37`	`+ if ($this->checkLocaleInSupportedLocales($locale)) {`
	`38`	`+ return $locale;`
	`39`	`+ }`
`37`	`40`	`}`
`38`	`41`
`39`		`- return config('translatable.fallback_locale');`
	`42`	`+ return app()->getLocale() ?? config('translatable.fallback_locale');`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`/**`