From 4223a11e3cf9e94c2ea51910ce83ca38b021d52e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 17 Jan 2020 20:55:27 -0700
Subject: [PATCH 1/2] Update settings view, fix default language

---
 resources/views/settings/home.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php
index 2146be34..551aab1c 100644
--- a/resources/views/settings/home.blade.php
+++ b/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>

From 7f4edbfecf34dcb9a5af45aa9204093be5a8d4db Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 17 Jan 2020 20:56:20 -0700
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61ba15e4..473605f1 100644
--- a/CHANGELOG.md
+++ b/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