Merge commit 'mainstream/master'

Conflicts:
	railties/doc/guides/html/action_mailer_basics.html
	railties/doc/guides/html/getting_started_with_rails.html
	railties/doc/guides/html/i18n.html
	railties/doc/guides/source/action_mailer_basics.txt
	railties/doc/guides/source/getting_started_with_rails.txt
	railties/doc/guides/source/i18n.txt

2 files changed, 18 insertions, 7 deletions

diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index 4b7d1e32fd..ec61715b57 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -99,13 +99,19 @@ module ActionController #:nodoc:
 
       # Attempts to render a static error page based on the
       # <tt>status_code</tt> thrown, or just return headers if no such file
-      # exists. For example, if a 500 error is being handled Rails will first
-      # attempt to render the file at <tt>public/500.html</tt>. If the file
-      # doesn't exist, the body of the response will be left empty.
+      # exists. At first, it will try to render a localized static page.
+      # For example, if a 500 error is being handled Rails and locale is :da,
+      # it will first attempt to render the file at <tt>public/500.da.html</tt>
+      # then attempt to render <tt>public/500.html</tt>. If none of them exist,
+      # the body of the response will be left empty.
       def render_optional_error_file(status_code)
         status = interpret_status(status_code)
-        path = "#{Rails.public_path}/#{status.to_s[0,3]}.html"
-        if File.exist?(path)
+        locale_path = "#{Rails.public_path}/#{status[0,3]}.#{I18n.locale}.html" if I18n.locale
+        path = "#{Rails.public_path}/#{status[0,3]}.html"
+
+        if locale_path && File.exist?(locale_path)
+          render :file => locale_path, :status => status, :content_type => Mime::HTML
+        elsif File.exist?(path)
           render :file => path, :status => status, :content_type => Mime::HTML
         else
           head status
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 0b0d0c799b..d2059d51f4 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -127,9 +127,14 @@ module ActionController
     #
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
-      protected
-        attr_accessor :exception
+      def self.included(base)
+        base.class_eval do
+          attr_accessor :exception
+          protected :exception, :exception=
+        end
+      end
 
+      protected
         def rescue_action_without_handler(e)
           self.exception = e