From d63c09c17f49ab220b5c3785f3684b77a70d4641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 15 Jun 2021 14:46:18 +0300
Subject: [PATCH] Fixed User set locale, but not working translation

---
 app/Jobs/Install/DisableModule.php   | 2 +-
 app/Jobs/Install/EnableModule.php    | 2 +-
 app/Jobs/Install/InstallModule.php   | 2 +-
 app/Jobs/Install/UninstallModule.php | 2 +-
 app/Utilities/Overrider.php          | 4 +++-
 database/seeds/Modules.php           | 4 ++--
 database/seeds/TestCompany.php       | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Jobs/Install/DisableModule.php b/app/Jobs/Install/DisableModule.php
index 6f7d5d8ea..cc3854caf 100644
--- a/app/Jobs/Install/DisableModule.php
+++ b/app/Jobs/Install/DisableModule.php
@@ -24,7 +24,7 @@ class DisableModule extends Job
     {
         $this->alias = $alias;
         $this->company_id = $company_id;
-        $this->locale = $locale ?: app()->getLocale();
+        $this->locale = $locale ?: company($company_id)->locale;
     }
 
     /**
diff --git a/app/Jobs/Install/EnableModule.php b/app/Jobs/Install/EnableModule.php
index 4f40b30eb..8f225e2da 100644
--- a/app/Jobs/Install/EnableModule.php
+++ b/app/Jobs/Install/EnableModule.php
@@ -24,7 +24,7 @@ class EnableModule extends Job
     {
         $this->alias = $alias;
         $this->company_id = $company_id;
-        $this->locale = $locale ?: app()->getLocale();
+        $this->locale = $locale ?: company($company_id)->locale;
     }
 
     /**
diff --git a/app/Jobs/Install/InstallModule.php b/app/Jobs/Install/InstallModule.php
index 705c5fb83..1d8e85b03 100644
--- a/app/Jobs/Install/InstallModule.php
+++ b/app/Jobs/Install/InstallModule.php
@@ -24,7 +24,7 @@ class InstallModule extends Job
     {
         $this->alias = $alias;
         $this->company_id = $company_id;
-        $this->locale = $locale ?: app()->getLocale();
+        $this->locale = $locale ?: company($company_id)->locale;
     }
 
     /**
diff --git a/app/Jobs/Install/UninstallModule.php b/app/Jobs/Install/UninstallModule.php
index 9a82c2dc1..6cfe56d58 100644
--- a/app/Jobs/Install/UninstallModule.php
+++ b/app/Jobs/Install/UninstallModule.php
@@ -24,7 +24,7 @@ class UninstallModule extends Job
     {
         $this->alias = $alias;
         $this->company_id = $company_id;
-        $this->locale = $locale ?: app()->getLocale();
+        $this->locale = $locale ?: company($company_id)->locale;
     }
 
     /**
diff --git a/app/Utilities/Overrider.php b/app/Utilities/Overrider.php
index 0430b81fb..912c0f704 100644
--- a/app/Utilities/Overrider.php
+++ b/app/Utilities/Overrider.php
@@ -47,7 +47,9 @@ class Overrider
 
         // Locale
         if (session('locale') == '') {
-            app()->setLocale(setting('default.locale'));
+            $locale = (user()->locale) ?? setting('default.locale');
+
+            app()->setLocale($locale);
         }
 
         // Set app url dynamically if empty
diff --git a/database/seeds/Modules.php b/database/seeds/Modules.php
index 66b7578d3..eb04841a5 100644
--- a/database/seeds/Modules.php
+++ b/database/seeds/Modules.php
@@ -29,13 +29,13 @@ class Modules extends Seeder
         Artisan::call('module:install', [
             'alias'     => 'offline-payments',
             'company'   => $company_id,
-            'locale'    => session('locale', app()->getLocale()),
+            'locale'    => session('locale', company($company_id)->locale),
         ]);
 
         Artisan::call('module:install', [
             'alias'     => 'paypal-standard',
             'company'   => $company_id,
-            'locale'    => session('locale', app()->getLocale()),
+            'locale'    => session('locale', company($company_id)->locale),
         ]);
     }
 }
diff --git a/database/seeds/TestCompany.php b/database/seeds/TestCompany.php
index 7191464a8..fad4a8520 100644
--- a/database/seeds/TestCompany.php
+++ b/database/seeds/TestCompany.php
@@ -107,7 +107,7 @@ class TestCompany extends Seeder
             Artisan::call('module:install', [
                 'alias'     => $alias,
                 'company'   => company_id(),
-                'locale'    => session('locale', app()->getLocale()),
+                'locale'    => session('locale', company(company_id())->locale),
             ]);
         }