Permalink
Browse files

Render implicit html template when xhr request now supports localizat…

…ion [#1886 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information...
1 parent f98d8ee commit 50f51ff95047858fa6dd889ade3027b7254c6dc0 @josevalim josevalim committed with josh Feb 7, 2009
@@ -50,6 +50,8 @@ def find_template(original_template_path, format = nil)
elsif template = load_path[template_path]
return template
# Try to find html version if the format is javascript
+ elsif format == :js && template = load_path["#{template_path}.#{I18n.locale}.html"]
+ return template
elsif format == :js && template = load_path["#{template_path}.html"]
return template
end
@@ -44,6 +44,25 @@ def test_render_file_with_dashed_locale
I18n.locale = old_locale
end
+ def test_render_implicit_html_template_from_xhr_request
+ old_format = @view.template_format
+ @view.template_format = :js
+ assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+ ensure
+ @view.template_format = old_format
+ end
+
+ def test_render_implicit_html_template_from_xhr_request_with_localization
+ old_locale = I18n.locale
+ old_format = @view.template_format
+ I18n.locale = :da
+ @view.template_format = :js
+ assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+ ensure
+ I18n.locale = old_locale
+ @view.template_format = old_format
+ end
+
def test_render_file_at_top_level
assert_equal 'Elastica', @view.render(:file => '/shared')
end

1 comment on commit 50f51ff

Contributor

josevalim commented on 50f51ff Feb 7, 2009

Thanks Joshua! :)

Please sign in to comment.