diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-04-08 18:11:26 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-04-08 18:11:26 -0700 |
| commit | 99d54599215c2a8cea7e57f609e8e578043d71b2 (patch) | |
| tree | ad6dd5ac7a65525f3b372d52194b50d035ce1579 /actionpack/lib/action_view | |
| parent | 1e3dce08e11bd11e7d774512ea599166c4c45378 (diff) | |
| download | rails-99d54599215c2a8cea7e57f609e8e578043d71b2.tar.gz rails-99d54599215c2a8cea7e57f609e8e578043d71b2.tar.bz2 rails-99d54599215c2a8cea7e57f609e8e578043d71b2.zip | |
Fixed that default locale templates should be used if the current locale template is missing [DHH]
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/lookup_context.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index 9b59aac0eb..6e61d85dcc 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -38,7 +38,7 @@ module ActionView end register_detail(:formats) { Mime::SET.symbols } - register_detail(:locale) { [I18n.locale] } + register_detail(:locale) { [I18n.locale, I18n.default_locale] } class DetailsKey #:nodoc: alias :eql? :equal? @@ -160,7 +160,7 @@ module ActionView config = I18n.config.respond_to?(:i18n_config) ? I18n.config.i18n_config : I18n.config config.locale = value end - super(I18n.locale) + super(_locale_defaults) end # Update the details keys by merging the given hash into the current |