From a8dd685f114cac68985f2df75adaf3a46b2ea46d Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Fri, 14 Apr 2023 10:16:10 +0000 Subject: [PATCH] Fixed translatable json related to the current Locale --- app/Traits/Models/MiniCrudModelJsonTranslatable.php | 13 +++++++------ routes/web-bo.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Traits/Models/MiniCrudModelJsonTranslatable.php b/app/Traits/Models/MiniCrudModelJsonTranslatable.php index ff1d3547..654da76c 100644 --- a/app/Traits/Models/MiniCrudModelJsonTranslatable.php +++ b/app/Traits/Models/MiniCrudModelJsonTranslatable.php @@ -4,6 +4,7 @@ namespace App\Traits\Models; use App\Enums\InputType; use App\Lib\Helpers\FileStorageHelper; +use Illuminate\Support\Facades\App; trait MiniCrudModelJsonTranslatable { @@ -77,20 +78,20 @@ trait MiniCrudModelJsonTranslatable private function serializeData(array $data): string { foreach ($data as $o => $input) { - $field = $input['en'] ?? $input; + $field = $input[App::currentLocale()] ?? $input; switch ($field['inputType']) { case InputType::image->value: - $data[$o]['en']['value'] = FileStorageHelper::storeFile($this, $input['value'], true); - $data[$o]['en']['alt'] = $input['alt']; - $data[$o]['en']['title'] = $input['title']; + $data[$o][App::currentLocale()]['value'] = FileStorageHelper::storeFile($this, $input['value'], true); + $data[$o][App::currentLocale()]['alt'] = $input['alt']; + $data[$o][App::currentLocale()]['title'] = $input['title']; break; case InputType::boolean->value: case InputType::text->value: - $data[$o]['en']['value'] = $input['value']; + $data[$o][App::currentLocale()]['value'] = $input['value']; break; case InputType::number->value: case InputType::string->value: - $data[$o]['en']['value'] = $input['value']; + $data[$o][App::currentLocale()]['value'] = $input['value']; break; case InputType::videoVimeo->value: case InputType::url->value: diff --git a/routes/web-bo.php b/routes/web-bo.php index c8cc8a39..2aebbe71 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -14,7 +14,7 @@ use App\Http\Controllers\Bo\SliderController; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Route; -$langs = ['en', 'de']; +$langs = config('app.availableLocales'); foreach($langs as $lang) { Route::prefix('bo/' . $lang . '/') ->name('bo.' . $lang . '.')