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

Uses locale config from env while install

Browse Source
This commit is contained in:
Yasir Turk
2022-08-08 19:00:28 +02:00
parent 3e76375f26
commit c1604d4a3e
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Install/Language.php
View File

@@ -14,7 +14,11 @@ class Language extends Controller
*/
public function create()
{
return view('install.language.create');
$locale = config('app.locale');
if (!$locale || !array_key_exists($locale, language()->allowed())) {
$locale = 'en-GB';
}
return view('install.language.create')->with(['locale' => $locale]);
}
/**

6
app/Http/Controllers/Install/Settings.php
View File

@@ -29,11 +29,13 @@ class Settings extends Controller
public function store(Request $request)
{
DB::transaction(function () use ($request) {
$locale = session('locale') ?? config('app.locale');
// Create company
Installer::createCompany($request->get('company_name'), $request->get('company_email'), session('locale'));
Installer::createCompany($request->get('company_name'), $request->get('company_email'), $locale);
// Create user
Installer::createUser($request->get('user_email'), $request->get('user_password'), session('locale'));
Installer::createUser($request->get('user_email'), $request->get('user_password'), $locale);
});
// Make the final touches