shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed User set locale, but not working translation

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-15 14:46:18 +03:00
parent 33877c90d2
commit d63c09c17f
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Install/DisableModule.php
View File

@ -24,7 +24,7 @@ class DisableModule extends Job
{ {
$this->alias = $alias; $this->alias = $alias;
$this->company_id = $company_id; $this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale(); $this->locale = $locale ?: company($company_id)->locale;
} }
/** /**

2
app/Jobs/Install/EnableModule.php
View File

@ -24,7 +24,7 @@ class EnableModule extends Job
{ {
$this->alias = $alias; $this->alias = $alias;
$this->company_id = $company_id; $this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale(); $this->locale = $locale ?: company($company_id)->locale;
} }
/** /**

2
app/Jobs/Install/InstallModule.php
View File

@ -24,7 +24,7 @@ class InstallModule extends Job
{ {
$this->alias = $alias; $this->alias = $alias;
$this->company_id = $company_id; $this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale(); $this->locale = $locale ?: company($company_id)->locale;
} }
/** /**

2
app/Jobs/Install/UninstallModule.php
View File

@ -24,7 +24,7 @@ class UninstallModule extends Job
{ {
$this->alias = $alias; $this->alias = $alias;
$this->company_id = $company_id; $this->company_id = $company_id;
$this->locale = $locale ?: app()->getLocale(); $this->locale = $locale ?: company($company_id)->locale;
} }
/** /**

4
app/Utilities/Overrider.php
View File

@ -47,7 +47,9 @@ class Overrider
// Locale // Locale
if (session('locale') == '') { if (session('locale') == '') {
app()->setLocale(setting('default.locale')); $locale = (user()->locale) ?? setting('default.locale');
app()->setLocale($locale);
} }
// Set app url dynamically if empty // Set app url dynamically if empty

4
database/seeds/Modules.php
View File

@ -29,13 +29,13 @@ class Modules extends Seeder
Artisan::call('module:install', [ Artisan::call('module:install', [
'alias' => 'offline-payments', 'alias' => 'offline-payments',
'company' => $company_id, 'company' => $company_id,
'locale' => session('locale', app()->getLocale()), 'locale' => session('locale', company($company_id)->locale),
]); ]);
Artisan::call('module:install', [ Artisan::call('module:install', [
'alias' => 'paypal-standard', 'alias' => 'paypal-standard',
'company' => $company_id, 'company' => $company_id,
'locale' => session('locale', app()->getLocale()), 'locale' => session('locale', company($company_id)->locale),
]); ]);
} }
} }

2
database/seeds/TestCompany.php
View File

@ -107,7 +107,7 @@ class TestCompany extends Seeder
Artisan::call('module:install', [ Artisan::call('module:install', [
'alias' => $alias, 'alias' => $alias,
'company' => company_id(), 'company' => company_id(),
'locale' => session('locale', app()->getLocale()), 'locale' => session('locale', company(company_id())->locale),
]); ]);
} }