Thread-safe locale switching (#4237)

decidim · Oct 9, 2018 · cf2d73c · cf2d73c
1 parent 392d40b
commit cf2d73c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -61,6 +61,7 @@ Decidim::User.where(**search for old subscribed users**).update(newsletter_notif
 - **decidim-core**: Fix newsletter opt-in migration [\#4198](https://github.com/decidim/decidim/pull/4198)
 - **decidim-core**: Hide weird flash message [\#4235](https://github.com/decidim/decidim/pull/4235)
 - **decidim-core**: Fix newsletter subscription checkbox always being unchecked [\#4238](https://github.com/decidim/decidim/pull/4238)
+- **decidim-core**: Thread safe locale switching [\#4237](https://github.com/decidim/decidim/pull/4237)
 
 **Removed**:
 

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