diff options
| author | Thierry Joyal <thierry.joyal@gmail.com> | 2019-04-16 18:54:51 +0000 |
|---|---|---|
| committer | Thierry Joyal <thierry.joyal@gmail.com> | 2019-04-16 18:54:51 +0000 |
| commit | 963d11a000437241c958f8af9b3de118e100f133 (patch) | |
| tree | 9f1260b5b2faed6b8912a3833351501681ab0ddd /railties/lib | |
| parent | b49e38b76b0998b0a8312d8c08c98728d3de2006 (diff) | |
| download | rails-963d11a000437241c958f8af9b3de118e100f133.tar.gz rails-963d11a000437241c958f8af9b3de118e100f133.tar.bz2 rails-963d11a000437241c958f8af9b3de118e100f133.zip | |
[Rails::MailersController] Do not leak I18n global setting changes
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/mailers_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb index 5cffa52860..4a1942790b 100644 --- a/railties/lib/rails/mailers_controller.rb +++ b/railties/lib/rails/mailers_controller.rb @@ -5,8 +5,9 @@ require "rails/application_controller" class Rails::MailersController < Rails::ApplicationController # :nodoc: prepend_view_path ActionDispatch::DebugView::RESCUES_TEMPLATE_PATH + around_action :set_locale, only: :preview + before_action :find_preview, only: :preview before_action :require_local!, unless: :show_previews? - before_action :find_preview, :set_locale, only: :preview helper_method :part_query, :locale_query @@ -92,6 +93,8 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc: end def set_locale - I18n.locale = params[:locale] || I18n.default_locale + I18n.with_locale(params[:locale] || I18n.default_locale) do + yield + end end end |