Fixed User set locale, but not working translation

akaunting · Jun 15, 2021 · d63c09c · d63c09c
1 parent 33877c9
commit d63c09c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/app/Jobs/Install/DisableModule.php b/app/Jobs/Install/DisableModule.php
@@ -24,7 +24,7 @@ public function __construct($alias, $company_id, $locale = null)
     {
         $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
@@ -24,7 +24,7 @@ public function __construct($alias, $company_id, $locale = null)
     {
         $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
@@ -24,7 +24,7 @@ public function __construct($alias, $company_id, $locale = null)
     {
         $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
@@ -24,7 +24,7 @@ public function __construct($alias, $company_id, $locale = null)
     {
         $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
@@ -47,7 +47,9 @@ protected static function loadSettings()
 
         // 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
@@ -29,13 +29,13 @@ private function create()
         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
@@ -107,7 +107,7 @@ private function installModules()
             Artisan::call('module:install', [
                 'alias'     => $alias,
                 'company'   => company_id(),
-                'locale'    => session('locale', app()->getLocale()),
+                'locale'    => session('locale', company(company_id())->locale),
             ]);
         }