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
Show Stats 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() 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) public function store(Request $request)
{ {
DB::transaction(function () use ($request) { DB::transaction(function () use ($request) {
$locale = session('locale') ?? config('app.locale');
// Create company // 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 // 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 // Make the final touches

2
resources/views/install/language/create.blade.php
View File

@ -7,7 +7,7 @@
<div class="mb-0"> <div class="mb-0">
<select name="lang" id="lang" size="14" class="w-full text-black text-sm font-medium"> <select name="lang" id="lang" size="14" class="w-full text-black text-sm font-medium">
@foreach (language()->allowed() as $code => $name) @foreach (language()->allowed() as $code => $name)
<option value="{{ $code }}" @if ($code=='en-GB' ) {{ 'selected="selected"' }} @endif>{{ $name }}</option> <option value="{{ $code }}" @if ($code == $locale) {{ 'selected="selected"' }} @endif>{{ $name }}</option>
@endforeach @endforeach
</select> </select>
</div> </div>