diff --git a/Modules/Language/app/Services/LanguageService.php b/Modules/Language/app/Services/LanguageService.php index 01ce42b7..7f535d3d 100644 --- a/Modules/Language/app/Services/LanguageService.php +++ b/Modules/Language/app/Services/LanguageService.php @@ -155,7 +155,13 @@ class LanguageService extends MediaService protected function getDefaultLocale(): string { - return config('app.fallback_locale', config('app.locale', 'en')); + $default = Language::where('is_default', true)->value('code'); + + if ($default) { + return $default; + } + + return config('app.locale', 'en'); } protected function buildTranslationsFromFiles(string $locale): array