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

Merge pull request #2586 from yasirmturk/feature/install-locale-settings-env

Browse Source 
Uses locale config from env while install
This commit is contained in:
EnesSacid-Buker 2023-02-16 10:12:51 +03:00 committed by GitHub
commit e97df9e255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

@ -6,8 +6,8 @@
<x-slot name="content"> <x-slot name="content">
<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 ($lang_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>