diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-12-04 20:07:54 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-12-04 20:08:23 -0200 |
| commit | b696dd70db651c6cb4a096dd0d5762416acd9917 (patch) | |
| tree | 7b0eb91b9169c29fdc1a670373de08de704b29d9 /actionpack | |
| parent | be4551f63bc3dec7e182371d25e7b9ee0e9148c4 (diff) | |
| download | rails-b696dd70db651c6cb4a096dd0d5762416acd9917.tar.gz rails-b696dd70db651c6cb4a096dd0d5762416acd9917.tar.bz2 rails-b696dd70db651c6cb4a096dd0d5762416acd9917.zip | |
Allow back passing :rescue_format => nil and test added
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/translation_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/translation_helper_test.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb index 76dac20f4b..e7ec1df2c8 100644 --- a/actionpack/lib/action_view/helpers/translation_helper.rb +++ b/actionpack/lib/action_view/helpers/translation_helper.rb @@ -44,7 +44,7 @@ module ActionView # naming convention helps to identify translations that include HTML tags so that # you know what kind of output to expect when you call translate in a template. def translate(key, options = {}) - options[:rescue_format] ||= :html + options.merge!(:rescue_format => :html) unless options.key?(:rescue_format) translation = I18n.translate(scope_key_by_partial(key), options) if html_safe_translation_key?(key) && translation.respond_to?(:html_safe) translation.html_safe diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb index 67d459136b..9b5c6d127c 100644 --- a/actionpack/test/template/translation_helper_test.rb +++ b/actionpack/test/template/translation_helper_test.rb @@ -40,6 +40,11 @@ class TranslationHelperTest < ActiveSupport::TestCase assert_equal expected, translate(:"translations.missing") end + def test_returns_missing_translation_message_using_nil_as_rescue_format + expected = 'translation missing: en.translations.missing' + assert_equal expected, translate(:"translations.missing", :rescue_format => nil) + end + def test_translation_returning_an_array expected = %w(foo bar) assert_equal expected, translate(:"translations.array") |