From: Tomonori Murakami <crosslife777@gmail.com>
Date: Mon, 22 May 2017 15:58:41 +0000 (+0900)
Subject: Fix locale bug when change it on preferences (#3223) (#3232)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7966d3a872bb002d98e506e7ab34c0016b8ab8fe;p=mastodon.git

Fix locale bug when change it on preferences (#3223) (#3232)
---

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 28757d1bc..3dc3013c3 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -11,6 +11,7 @@ class Settings::PreferencesController < ApplicationController
     user_settings.update(user_settings_params.to_h)
 
     if current_user.update(user_params)
+      I18n.locale = current_user.locale
       redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show