diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2014-09-06 07:10:23 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2014-09-06 07:10:23 -0700 |
| commit | e11914b55110e8376e43476668ed8d5323b8dcba (patch) | |
| tree | 44f4d342a2df226165f9f9c41d8c5342f0f6291f | |
| parent | 8d75aa9cb335e9d012978dfdfd0bfa1bdf989fae (diff) | |
| parent | ab2ace6bbef1cc98c98e5a9a6b45e734bc5edd9d (diff) | |
| download | rails-e11914b55110e8376e43476668ed8d5323b8dcba.tar.gz rails-e11914b55110e8376e43476668ed8d5323b8dcba.tar.bz2 rails-e11914b55110e8376e43476668ed8d5323b8dcba.zip | |
Merge pull request #16824 from rajcybage/action_view_content_tag
fix the undefined method content_tag #15245
| -rw-r--r-- | actionview/lib/action_view/helpers/translation_helper.rb | 1 | ||||
| -rw-r--r-- | actionview/test/template/translation_helper_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb index 1d50ea2ff5..c2fda42396 100644 --- a/actionview/lib/action_view/helpers/translation_helper.rb +++ b/actionview/lib/action_view/helpers/translation_helper.rb @@ -6,6 +6,7 @@ module ActionView # = Action View Translation Helpers module Helpers module TranslationHelper + include TagHelper # Delegates to <tt>I18n#translate</tt> but also performs three additional functions. # # First, it will ensure that any thrown +MissingTranslation+ messages will be turned diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb index 41f6770f23..362f05ea70 100644 --- a/actionview/test/template/translation_helper_test.rb +++ b/actionview/test/template/translation_helper_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' class TranslationHelperTest < ActiveSupport::TestCase - include ActionView::Helpers::TagHelper include ActionView::Helpers::TranslationHelper attr_reader :request, :view |