Updated user language select to use correct default

- Updated localisation system to take note of system defaul locale
before replacing the current locale
Fixes #1316

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index e65b417d5079f43535930ab77d86a915d80ca8b8..ff5526cc70d61f6fbdcde2aa35a63c034d74ff1a 100644 (file)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -51,6 +51,7 @@ class Localization
     public function handle($request, Closure $next)
     {
         $defaultLang = config('app.locale');
+        config()->set('app.default_locale', $defaultLang);
 
         if (user()->isDefault() && config('app.auto_detect_locale')) {
             $locale = $this->autoDetectLocale($request, $defaultLang);
@@ -63,8 +64,6 @@ class Localization
             config()->set('app.rtl', true);
         }
 
-
-
         app()->setLocale($locale);
         Carbon::setLocale($locale);
         $this->setSystemDateLocale($locale);

diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index c903bd60a5dc4b811bcf2604965aa3692d020382..c9491e3eeb4b4c949248680b9d43b1a0e45c3f59 100644 (file)
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -41,6 +41,7 @@ class SettingService
         if ($default === false) {
             $default = config('setting-defaults.' . $key, false);
         }
+
         if (isset($this->localCache[$key])) {
             return $this->localCache[$key];
         }

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index c4b02f9b9714f9e30ea17ed4ab78af4a7a198eb2..1b0514f9cdc4de07a3cfcee151e3abb62c2ff44e 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -38,8 +38,9 @@
                             <div class="form-group">
                                 <label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
                                 <select name="setting[language]" id="user-language">
+
                                     @foreach(trans('settings.language_select') as $lang => $label)
-                                        <option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
+                                        <option @if(setting()->getUser($user, 'language', config('app.default_locale')) === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
                                     @endforeach
                                 </select>
                             </div>