Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81

config/initializers/10-patches.rb

@@ -1,18 +1,37 @@
 
-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"
-} if ActiveRecord::Errors.respond_to?('default_error_messages=')
+require 'activerecord'
+
+module ActiveRecord
+  class Base
+    include Redmine::I18n
+    
+    # Translate attribute names for validation errors display
+    def self.human_attribute_name(attr)
+      l("field_#{attr.to_s.gsub(/_id$/, '')}")
+    end
+  end
+end
+
+module ActionView
+  module Helpers
+    module DateHelper
+      # distance_of_time_in_words breaks when difference is greater than 30 years
+      def distance_of_date_in_words(from_date, to_date = 0, options = {})
+        from_date = from_date.to_date if from_date.respond_to?(:to_date)
+        to_date = to_date.to_date if to_date.respond_to?(:to_date)
+        distance_in_days = (to_date - from_date).abs
+
+        I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
+          case distance_in_days
+            when 0..60     then locale.t :x_days,             :count => distance_in_days
+            when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
+            else                locale.t :over_x_years,       :count => (distance_in_days / 365).round
+          end
+        end
+      end
+    end
+  end
+end
 
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
 

config/initializers/30-redmine.rb

@@ -1,7 +1,3 @@
-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)
+I18n.default_locale = 'en'
 
 require 'redmine'