From b8b4750f46eabc1b40957af4a93faabc525e6c9e Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sat, 23 Mar 2024 12:43:01 -0400 Subject: [PATCH] Simplify locales --- app/Http/Controllers/Admin/Settings/IndexController.php | 2 +- app/Http/Controllers/Admin/UserController.php | 4 ++-- app/Traits/Helpers/AvailableLanguages.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/Settings/IndexController.php b/app/Http/Controllers/Admin/Settings/IndexController.php index 4408ebffd..47c567458 100644 --- a/app/Http/Controllers/Admin/Settings/IndexController.php +++ b/app/Http/Controllers/Admin/Settings/IndexController.php @@ -33,7 +33,7 @@ class IndexController extends Controller { return view('admin.settings.index', [ 'version' => $this->versionService, - 'languages' => $this->getAvailableLanguages(true), + 'languages' => $this->getAvailableLanguages(), ]); } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 6e5e9f47f..33ced4b75 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -60,7 +60,7 @@ class UserController extends Controller public function create(): View { return view('admin.users.new', [ - 'languages' => $this->getAvailableLanguages(true), + 'languages' => $this->getAvailableLanguages(), ]); } @@ -71,7 +71,7 @@ class UserController extends Controller { return view('admin.users.view', [ 'user' => $user, - 'languages' => $this->getAvailableLanguages(true), + 'languages' => $this->getAvailableLanguages(), ]); } diff --git a/app/Traits/Helpers/AvailableLanguages.php b/app/Traits/Helpers/AvailableLanguages.php index 9b205c228..cab5a76ba 100644 --- a/app/Traits/Helpers/AvailableLanguages.php +++ b/app/Traits/Helpers/AvailableLanguages.php @@ -13,9 +13,9 @@ trait AvailableLanguages * Return all the available languages on the Panel based on those * that are present in the language folder. */ - public function getAvailableLanguages(bool $localize = false): array + public function getAvailableLanguages(): array { - return collect($this->getFilesystemInstance()->directories(base_path('lang')))->mapWithKeys(function ($path) use ($localize) { + return collect($this->getFilesystemInstance()->directories(base_path('lang')))->mapWithKeys(function ($path) { $code = basename($path); $value = Locale::getDisplayName($code, app()->currentLocale());