Merge pull request #4001 from rockandror/check-session-locale

Discard session[:locale] when is not valid
2020-06-25 22:00:37 +02:00
parent 11a1fa1b1d 3b5a96bdfd
commit 328ec5e25f
5 changed files with 34 additions and 14 deletions
--- a/app/controllers/admin/site_customization/information_texts_controller.rb
+++ b/app/controllers/admin/site_customization/information_texts_controller.rb
@@ -18,8 +18,9 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz
            next
          else
            text = I18nContent.find_or_create_by!(key: content[:id])
-            Globalize.locale = locale
-            text.update!(value: value)
+            Globalize.with_locale(locale) do
+              text.update!(value: value)
+            end
          end
        end
      end