Thread-safe locale switching

decidim · Oct 5, 2018 · 06033a2 · 06033a2
1 parent 01a73a3
commit 06033a2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/decidim-core/app/controllers/concerns/decidim/locale_switcher.rb b/decidim-core/app/controllers/concerns/decidim/locale_switcher.rb
@@ -8,20 +8,20 @@ module LocaleSwitcher
     extend ActiveSupport::Concern
 
     included do
-      before_action :set_locale
+      around_action :switch_locale
       helper_method :current_locale, :available_locales, :default_locale
 
       # Sets the locale for the current session.
       #
       # Returns nothing.
-      def set_locale
+      def switch_locale(&action)
         locale = if params["locale"]
                    params["locale"]
                  elsif current_user && current_user.locale.present?
                    current_user.locale
                  end
 
-        I18n.locale = available_locales.include?(locale) ? locale : default_locale
+        I18n.with_locale(available_locales.include?(locale) ? locale : default_locale, &action)
       end
 
       # Adds the current locale to all the URLs generated by url_for so users