Add user language preference detection as default fallback (nabeelio#…

…1894) Co-authored-by: Nabeel S. <[email protected]>
arthurpar06 · Nov 19, 2024 · ac085e8 · ac085e8
1 parent 5862b40
commit ac085e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/Http/Middleware/SetActiveLanguage.php b/app/Http/Middleware/SetActiveLanguage.php
@@ -18,7 +18,15 @@ class SetActiveLanguage
      */
     public function handle(Request $request, Closure $next)
     {
-        App::setLocale($request->cookie('lang', config('app.locale', 'en')));
+        $preferredLanguage = 'en';
+        if ($request->hasCookie('lang')) {
+            $preferredLanguage = $request->cookie('lang', config('app.locale', 'en'));
+        } else {
+            $preferredLanguage = $request->getPreferredLanguage(array_keys(config('languages')));
+        }
+
+        App::setLocale($preferredLanguage);
+
         return $next($request);
     }
 }
diff --git a/config/languages.php b/config/languages.php
@@ -1,14 +1,15 @@
 <?php
 
 return [
-    'de' => [
-        'display'   => 'German',
-        'flag-icon' => 'de',
-    ],
+    // First in the list is the default
     'en' => [
         'display'   => 'English',
         'flag-icon' => 'us',
     ],
+    'de' => [
+        'display'   => 'German',
+        'flag-icon' => 'de',
+    ],
     'es-es' => [
         'display'   => 'Spanish (Spain)',
         'flag-icon' => 'es',