From c424465321551d4f41bb04d1c7232d422b3024b5 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 7 Oct 2019 19:37:38 +0800
Subject: [PATCH] Fix locale detection

---
 app/Http/Middleware/DetectLanguagePrefer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Middleware/DetectLanguagePrefer.php b/app/Http/Middleware/DetectLanguagePrefer.php
index 6a652cbf..7281206f 100644
--- a/app/Http/Middleware/DetectLanguagePrefer.php
+++ b/app/Http/Middleware/DetectLanguagePrefer.php
@@ -13,7 +13,7 @@ class DetectLanguagePrefer
         if (($info = Arr::get(config('locales'), $locale)) && ($alias = Arr::get($info, 'alias'))) {
             $locale = $alias;
         }
-        app()->setLocale($locale);
+        app()->setLocale($locale ?? app()->getLocale());
         Cookie::queue('locale', $locale);
 
         return $next($request);