@@ -15,13 +15,13 @@ module ActionController path = "#{Rails.public_path}/#{status[0,3]}.html" if locale_path && File.exist?(locale_path) - render :file => locale_path, :status => status + render :file => locale_path, :status => status, :content_type => Mime::HTML elsif File.exist?(path) - render :file => path, :status => status + render :file => path, :status => status, :content_type => Mime::HTML else head status end end end -end \ No newline at end of file +end lib/localized_rescue/actioncontroller/rescue.rb @@ -1,7 +1,7 @@ module ActionView #:nodoc: class PathSet < Array #:nodoc: - def find_template(original_template_path, format = nil) + def find_template(original_template_path, format = nil, html_fallback = true) return original_template_path if original_template_path.respond_to?(:render) template_path = original_template_path.sub(/^\//, '') @@ -15,14 +15,16 @@ module ActionView #:nodoc: elsif template = load_path[template_path] return template # Try to find html version if the format is javascript - elsif format == :js && template = load_path["#{I18n.locale}/#{template_path}.html"] + elsif format == :js && html_fallback && template = load_path["#{I18n.locale}/#{template_path}.html"] return template - elsif format == :js && template = load_path["#{template_path}.html"] + elsif format == :js && html_fallback && template = load_path["#{template_path}.html"] return template end end - Template.new(original_template_path, self) + return Template.new(original_template_path, original_template_path =~ /\A\// ? "" : ".") if File.file?(original_template_path) + + raise MissingTemplate.new(self, original_template_path, format) end end lib/localized_templates/actionview/paths.rb 852ac754340e0711ade5a833cfd9ae9b449eb80b José Valim jose.valim@gmail.com http://github.com/josevalim/localized_templates/commit/4280833fa586fd26dacf20cd8c8c8974914815bb 4280833fa586fd26dacf20cd8c8c8974914815bb 2009-03-31T06:07:59-07:00 2009-03-31T06:07:59-07:00 Ensure everything works on Rails 2.3.2 3ac7209e6d1bc46baf275fde2b684817856d7ab4 José Valim jose.valim@gmail.com