Fixed User set locale, but not working translation

2021-06-15 14:46:18 +03:00
parent 33877c90d2
commit d63c09c17f
7 changed files with 10 additions and 8 deletions
--- a/app/Utilities/Overrider.php
+++ b/app/Utilities/Overrider.php
@ -47,7 +47,9 @@ class Overrider

        // Locale
        if (session('locale') == '') {
-            app()->setLocale(setting('default.locale'));
+            $locale = (user()->locale) ?? setting('default.locale');
+
+            app()->setLocale($locale);
        }

        // Set app url dynamically if empty