From 02ca34affac85217bde3a49eadc19c44d5a1fb4e Mon Sep 17 00:00:00 2001
From: Dirk Helbert <info@dirk-helbert.de>
Date: Sun, 1 Dec 2019 22:59:16 +0100
Subject: [PATCH] Take the fallback_locale from app.config when locale is not
 defined in shop

---
 packages/Webkul/Core/src/Core.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 9bfc791a3..963af1b00 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -211,7 +211,13 @@ class Core
         if ($locale)
             return $locale;
 
-        return $locale = $this->localeRepository->findOneByField('code', app()->getLocale());
+        $locale = $this->localeRepository->findOneByField('code', app()->getLocale());
+
+        if(!$locale) {
+            $locale = $this->localeRepository->findOneByField('code', config('app.fallback_locale'));
+        }
+
+        return $locale;
     }
 
     /**