Merged Rails 2.1 compatibility branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 28 insertions, 0 deletions

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
new file mode 100644
index 000000000..fcc091997
--- /dev/null
+++ b/config/initializers/10-patches.rb
@@ -0,0 +1,17 @@
+
+ActiveRecord::Errors.default_error_messages = {
+  :inclusion => "activerecord_error_inclusion",
+  :exclusion => "activerecord_error_exclusion",
+  :invalid => "activerecord_error_invalid",
+  :confirmation => "activerecord_error_confirmation",
+  :accepted  => "activerecord_error_accepted",
+  :empty => "activerecord_error_empty",
+  :blank => "activerecord_error_blank",
+  :too_long => "activerecord_error_too_long",
+  :too_short => "activerecord_error_too_short",
+  :wrong_length => "activerecord_error_wrong_length",
+  :taken => "activerecord_error_taken",
+  :not_a_number => "activerecord_error_not_a_number"
+}
+
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
diff --git a/config/initializers/20-mime_types.rb b/config/initializers/20-mime_types.rb
new file mode 100644
index 000000000..269742b16
--- /dev/null
+++ b/config/initializers/20-mime_types.rb
@@ -0,0 +1,4 @@
+# Add new mime types for use in respond_to blocks:
+
+Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
+Mime::Type.register 'application/pdf', :pdf
diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
new file mode 100644
index 000000000..f2a9f6a30
--- /dev/null
+++ b/config/initializers/30-redmine.rb
@@ -0,0 +1,7 @@
+GLoc.set_config :default_language => :en
+GLoc.clear_strings
+GLoc.set_kcode
+GLoc.load_localized_strings
+GLoc.set_config(:raise_string_not_found_errors => false)
+
+require 'redmine'