From a50a87457e81f9b3d02733c22174cd05f69f1254 Mon Sep 17 00:00:00 2001
From: AA4ch1 <aa4ch1@gmail.com>
Date: Fri, 5 May 2017 03:39:25 +0900
Subject: [PATCH] Fix language selector on preferences page (#2794)

---
 app/views/settings/preferences/show.html.haml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 10618ebf64..b64fd7c969 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -5,7 +5,12 @@
   = render 'shared/error_messages', object: current_user
 
   .fields-group
-    = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }
+    = f.input :locale,
+      collection: I18n.available_locales,
+      wrapper: :with_label,
+      include_blank: false,
+      label_method: lambda { |locale| human_locale(locale) },
+      selected: I18n.locale
 
     = f.input :allowed_languages,
       collection: I18n.available_locales,
-- 
GitLab