diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-29 23:46:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-29 23:48:35 -0300 |
| commit | ecb1981bfd3ffaca3a3efd110fc85380ece8191d (patch) | |
| tree | 1b48cc326ad1c3ea800967a66cd106525e42e573 /actionmailer/lib/action_mailer | |
| parent | d9b080bf3b1f28a52a2020c5c4b106cddf0303e0 (diff) | |
| download | rails-ecb1981bfd3ffaca3a3efd110fc85380ece8191d.tar.gz rails-ecb1981bfd3ffaca3a3efd110fc85380ece8191d.tar.bz2 rails-ecb1981bfd3ffaca3a3efd110fc85380ece8191d.zip | |
Template lookup now respect default locale and I18n fallbacks.
Given the following templates:
mailer/demo.html.erb
mailer/demo.en.html.erb
mailer/demo.pt.html.erb
Before this change for a locale that doesn't have its related file
the `mailer/demo.html.erb` will
be rendered even if `en` is the default locale.
Now `mailer/demo.en.html.erb` has precedence over the file without
locale.
Also, it is possible to give a fallback.
mailer/demo.pt.html.erb
mailer/demo.pt-BR.html.erb
So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be
rendered given the right I18n fallback configuration.
Fixes #11884.
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 021a758940..53cc1fdb31 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -586,8 +586,6 @@ module ActionMailer } ActiveSupport::Notifications.instrument("process.action_mailer", payload) do - lookup_context.skip_default_locale! - super @_message = NullMail.new unless @_mail_was_called end |