Moved encoding work in progress to a feature branch.

This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.

1 files changed, 0 insertions, 18 deletions

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index d3a53d2147..6866eabf77 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -4,24 +4,6 @@ module ActionView
   class ActionViewError < StandardError #:nodoc:
   end
 
-  class EncodingError < StandardError #:nodoc:
-  end
-
-  class WrongEncodingError < EncodingError #:nodoc:
-    def initialize(string, encoding)
-      @string, @encoding = string, encoding
-    end
-
-    def message
-      "Your template was not saved as valid #{@encoding}. Please " \
-      "either specify #{@encoding} as the encoding for your template " \
-      "in your text editor, or mark the template with its " \
-      "encoding by inserting the following as the first line " \
-      "of the template:\n\n# encoding: <name of correct encoding>.\n\n" \
-      "The source of your template was:\n\n#{@string}"
-    end
-  end
-
   class MissingTemplate < ActionViewError #:nodoc:
     attr_reader :path