From f2be4059cf046c96ab6986527ba07071327f5bf2 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Tue, 15 Jun 2021 18:04:02 +0200
Subject: [PATCH] Set app locale

---
 app/Providers/AppServiceProvider.php | 7 +++++--
 resources/views/index.blade.php      | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 9a022317..c37df08d 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -22,10 +22,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $get_time_locale = App::getLocale() . '_' . mb_strtoupper(App::getLocale());
+        $app_locale = get_setting('language') ?? 'en';
+
+        // Set locale for application
+        app()->setLocale($app_locale);
 
         // Set locale for carbon dates
-        setlocale(LC_TIME, $get_time_locale);
+        setlocale(LC_TIME, $app_locale . '_' . mb_strtoupper($app_locale));
 
         // Get all migrations with all directories
         $this->loadMigrationsFrom(
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index b4a26d9e..10d134e9 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -40,8 +40,7 @@
         let config = {
             host: '{{ url('/') }}',
             api: '{{ url('/api') }}',
-            locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
-            language: '{{ $settings->language ?? 'en' }}',
+            locale: '{{ app()->getLocale() }}',
 
             app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
             app_logo: '{{ $settings->app_logo ?? null }}',