Merge pull request #1945 from pixelfed/staging

Update settings view, fix default language

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed Story Compose bug affecting postgres instances ([#1918](https://github.com/pixelfed/pixelfed/pull/1918))
 - Fixed header background bug on MomentUI profiles ([#1933](https://github.com/pixelfed/pixelfed/pull/1933))
 - Fixed TRUST_PROXIES configuration ([#1941](https://github.com/pixelfed/pixelfed/pull/1941))
+- Fixed settings page default language ([4223a11e](https://github.com/pixelfed/pixelfed/commit/4223a11e))
 
 
 ### Changed

resources/views/settings/home.blade.php

@@ -62,7 +62,7 @@
       <div class="col-sm-9">
         <select class="form-control" name="language">
         @foreach(App\Util\Localization\Localization::languages() as $lang)
-          <option value="{{$lang}}" {{Auth::user()->language ?? 'en' == $lang ? 'selected':''}}>{{locale_get_display_language($lang, 'en')}} - {{locale_get_display_language($lang, $lang)}}</option>
+          <option value="{{$lang}}" {{(Auth::user()->language ?? 'en') == $lang ? 'selected':''}}>{{locale_get_display_language($lang, 'en')}} - {{locale_get_display_language($lang, $lang)}}</option>
         @endforeach
         </select>
       </div>