Ticket #9726: i18n_agnostic_api.patch

activesupport/test/string_translation_test.rb

@@ +1 @@
+#require 'rubygems'
+#gem 'ruby-debug'
+#require 'ruby-debug'
+#Debugger.start
+
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class StringTranslationTest < Test::Unit::TestCase
+
+  def test_simple_string
+    assert_equal "A string to be translated",   "A string to be translated".t
+  end
+  
+  def test_simple_interpolated_string
+    assert_equal 'This must be translated', "%s must be translated".t('This')    
+  end
+  
+  def test_simple_pluralizable_string
+    assert_equal 'They have 1 translation to do',  "They have %d translations to do".t(1)
+    assert_equal 'They have 2 translations to do', "They have %d translations to do".t(2)    
+  end
+  
+  def test_interpolated_and_pluralizable_string
+    assert_equal "Tommy translated 1 translation",   "%s translated %d translations".t('Tommy',1)
+    assert_equal "Tommy translated 2 translations",  "%s translated %d translations".t('Tommy',2)
+    assert_equal "Tommy translated 1 translations",  "%s translated %d translations".t('Tommy','1')        
+  end
+  
+  def test_multiple_interpolated_and_pluralizable_string
+    assert_equal "Tommy & Joe translated 1 translation",  "%s & %s translated %d translations".t('Tommy','Joe',1)
+    assert_equal "Tommy & Joe translated 2 translations", "%s & %s translated %d translations".t('Tommy','Joe',2)    
+  end
+  
+  def test_error_string
+    assert_equal "1 error prohibited this pizza from being saved",  "%d errors prohibited this %s from being saved".t(1,'pizza')
+    assert_equal "2 errors prohibited this bagel from being saved", "%d errors prohibited this %s from being saved".t(2, 'bagel')    
+  end
+  
+  def test_complex_verbal_pluralizable_string
+    assert_equal "There is 1 translation to do",    "There are %d translations to do".t(1)
+    assert_equal "There are 2 translations to do",  "There are %d translations to do".t(2)    
+  end
+  
+  def test_complex_verbal_pluralizable_string_in_question_form
+    assert_equal "Is there 1 translation to do?",   "Are there %d translations to do?".t(1)
+    assert_equal "Are there 2 translations to do?", "Are there %d translations to do?".t(2)    
+  end
+  
+  def test_pluralizable_string_with_non_whitespace_characters_after_pluralizable_word
+    assert_equal "Omellette recipe (1 egg)",  "Omellette recipe (%d eggs)".t(1)
+    assert_equal "Omellette recipe (2 eggs)", "Omellette recipe (%d eggs)".t(2)    
+  end  
+  
+  def test_non_pluralizable_string_with_numeric_interpolation
+    assert_equal "Omellette recipe (eggs: 1)",  "Omellette recipe (eggs: %d)".t(1)    
+    assert_equal "Omellette recipe (eggs: 3)",  "Omellette recipe (eggs: %d)".t(3)    
+  end
+  
+  def test_pluralizable_strings_with_adjectives_before_noun_dont_singularize
+    assert_equal("Thomas has 1 old toys", "Thomas has %d old toys".t(1))
+    assert_equal("Thomas has 10 old toys", "Thomas has %d old toys".t(10))
+    
+    assert_equal("Thomas has 1 old scrabby toys", "Thomas has %d old scrabby toys".t(1))
+    assert_equal("Thomas has 10 old scrabby toys", "Thomas has %d old scrabby toys".t(10))    
+  end
+  
+  
+  def test_ignores_namespaces
+    assert_equal "any old string", "any old string".t(:namespace)
+    assert_equal "any old string", "any old %s".t(:namespace, 'string')
+    assert_equal "any 1 string", "any %d strings".t(:namespace, 1)
+    assert_equal "any 10 strings", "any %d strings".t(:namespace, 10)
+    assert_equal "Tommy has 1 string", "%s has %d strings".t(:namespace, 1, 'Tommy')
+    assert_equal "Tommy has 10 strings", "%s has %d strings".t(:namespace, 10, 'Tommy')
+  end
+
+end

activesupport/test/date_translation_test.rb

@@ +1 @@
+#require 'rubygems'
+#gem 'ruby-debug'
+#require 'ruby-debug'
+#Debugger.start
+
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class DateTranslationTest < Test::Unit::TestCase
+
+  def test_simple_date
+    assert_equal "Thu Jan 01 1970", Date.new(1970,1,1).t.strftime('%a %b %d %Y')
+  end
+  
+  def test_custom_translatable_time_class
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableDate
+        def overidden_strftime(*args)
+          'overidden'
+        end
+        alias_method :old_strftime, :strftime        
+        alias_method :strftime, :overidden_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "overidden", Date.new(1970,1,1).t.strftime('%a %b %d %Y')
+    
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableDate
+        alias_method :strftime, :old_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "Thu Jan 01 1970", Date.new(1970,1,1).t.strftime('%a %b %d %Y')
+  end
+end

activesupport/test/date_time_translation_test.rb

@@ +1 @@
+#require 'rubygems'
+#gem 'ruby-debug'
+#require 'ruby-debug'
+#Debugger.start
+
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class DateTimeTranslationTest < Test::Unit::TestCase
+
+  def test_simple_date_time
+    assert_equal "Thu Jan 01 01:00:00 1970", DateTime.new(1970,1,1,1,0,0).t.strftime('%a %b %d %H:%M:%S %Y')
+  end
+  
+  def test_custom_translatable_time_class
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableDateTime
+        def overidden_strftime(*args)
+          'overidden'
+        end
+        alias_method :old_strftime, :strftime        
+        alias_method :strftime, :overidden_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "overidden", DateTime.new(1970,1,1,1,0,0).t.strftime('%a %b %d %H:%M:%S %Y')
+    
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableDateTime
+        alias_method :strftime, :old_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "Thu Jan 01 01:00:00 1970", DateTime.new(1970,1,1,1,0,0).t.strftime('%a %b %d %H:%M:%S %Y')
+  end
+end

activesupport/test/time_translation_test.rb

@@ +1 @@
+#require 'rubygems'
+#gem 'ruby-debug'
+#require 'ruby-debug'
+#Debugger.start
+
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class TimeTranslationTest < Test::Unit::TestCase
+
+  def test_simple_time
+    assert_equal "Thu Jan 01 01:00:00 1970", Time.at(0).t.strftime('%a %b %d %H:%M:%S %Y')
+  end
+  
+  def test_custom_translatable_time_class
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableTime
+        def overidden_strftime(*args)
+          'overidden'
+        end
+        alias_method :old_strftime, :strftime        
+        alias_method :strftime, :overidden_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "overidden", Time.at(0).t.strftime('%a %b %d %H:%M:%S %Y')
+    
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableTime
+        alias_method :strftime, :old_strftime
+      end      
+    ENDDEF
+    
+    assert_equal "Thu Jan 01 01:00:00 1970", Time.at(0).t.strftime('%a %b %d %H:%M:%S %Y')
+    
+    
+  end
+end

activesupport/lib/active_support/translation/translatable_string.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module Translation #:nodoc:
+    class TranslatableString #:nodoc:
+      
+      class DefaultTranslatableString
+        
+        PLURALIZATION_REGEXP = /(%d\s+[^\s\W]+)/
+        DOWN_CASE_VERBAL_PLURALIZATION_REGEXP = /(are\s+%d\s+[^\s\W]+)/
+        UP_CASE_VERBAL_PLURALIZATION_REGEXP = /(Are\s+(.*)\s+%d\s+[^\s\W]+)/
+
+        # translates the supplied string
+        #
+        # Default implementation allows:
+        #
+        #  * simple/multiple string interpolation via %s
+        #     
+        #    e.g. "%s loves rails".t('G. W. Bush') => 'G. W. Bush loves rails'
+        #         "%s and %s love rails".t('G. W. Bush', 'J. Edgar Hoover') => 'G. W. Bush and J. Edgar Hoover love rails'
+        #
+        #  * simple pluralization via %d (with/out string interpolation)
+        #
+        #   e.g. "%d errors prohibited this pizza from being saved".t(1) => '1 error prohibited this pizza from being saved'
+        #        "%d errors prohibited this pizza from being saved".t(10) => '10 errors prohibited this pizza from being saved'
+        #
+        #        "%d errors prohibited this %s from being saved".t(1,'penguin') => '1 error prohibited this penguin from being saved'
+        #        "%d errors prohibited this %s from being saved".t(3,'penguin') => '3 errors prohibited this penguin from being saved'
+        #
+        #  * very basic pluralization of verb 'to be'
+        #
+        #   e.g. "There are %d translations to do".t(1) => 'There is 1 translation to do'
+        #        "There are %d translations to do".t(3) => 'There are 3 translations to do'
+        #
+        #        "Are there %d penguins?".t(1) => 'Is there 1 penguin?'
+        #        "Are there %d penguins?".t(3) => 'Are there 3 penguins?'        
+        def self.translate(string, args)
+           return string if args.nil? || (args.is_a?(Array) && args.compact.empty?)
+                      
+           #Add support for namespaces (ns if first argument is symbol)
+           return string if args.is_a? Symbol
+           args.shift if args.first.is_a? Symbol
+           return string if args.is_a?(Array) && args.empty?
+                                 
+           translated_string,string_interpolations, pluralization, plural = nil
+
+           case args
+             when String
+               translated_string = string % args
+             when Fixnum
+               pluralization = args
+             when Array
+               string_interpolations = args.select {|arg| arg.is_a? String}
+               pluralization = args.detect {|arg| arg.is_a? Fixnum}
+           end
+
+          if pluralization
+
+            #Handle singularization of verb 'to be'
+            translated_string = string.gsub(/(are)\s+/,'is ') if pluralization == 1 && string.match(DOWN_CASE_VERBAL_PLURALIZATION_REGEXP)
+            translated_string = string.gsub(/^(Are)\s+/,'Is ') if pluralization == 1 && string.match(UP_CASE_VERBAL_PLURALIZATION_REGEXP)
+
+            #Handle plurals
+            matches = translated_string ? translated_string.match(PLURALIZATION_REGEXP) : string.match(PLURALIZATION_REGEXP)
+            if matches
+              pluralizable_string = matches[1] 
+              plural = (pluralizable_string.gsub(/%d\s+/,'') % pluralization) if pluralizable_string
+              plural = (pluralization == 1) ? Inflector.singularize(plural) : plural if plural
+
+              if plural
+                translated_string = if translated_string
+                    translated_string.gsub(PLURALIZATION_REGEXP, "#{pluralization} #{plural}")           
+                  else
+                    string.gsub(PLURALIZATION_REGEXP, "#{pluralization} #{plural}")             
+                  end           
+              end           
+            else
+              #If there's still a %d in the string but it's not pluralizable then just do a normal interpolation
+              translated_string = translated_string ? (translated_string % pluralization) : (string % pluralization) if string.match(/%d/)
+            end
+
+          end
+
+          #Handle string interpolations
+          translated_string = ((translated_string ? translated_string : string) % string_interpolations) unless string_interpolations.empty?
+          translated_string ? translated_string : string          
+        end
+      end
+      
+
+      # translates the supplied string
+      #
+      # (see DefaultTranslatableString for default implementation)
+      def self.translate(string, args)
+        DefaultTranslatableString.translate(string, args)
+      end
+    end
+  end
+end

activesupport/lib/active_support/translation/translatable_date_time.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module Translation #:nodoc:
+    class TranslatableDateTime < ::DateTime #:nodoc:
+      def strftime(*args)
+        super(*args)
+      end
+    end
+  end
+end

activesupport/lib/active_support/translation/translatable_date.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module Translation #:nodoc:
+    class TranslatableDate < ::Date #:nodoc:
+      def strftime(*args)
+        super(*args)
+      end
+    end    
+  end
+end

activesupport/lib/active_support/translation/translatable_time.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module Translation #:nodoc:
+    class TranslatableTime < ::Time#:nodoc:
+      def strftime(*args)
+        super(*args)
+      end
+    end
+  end
+end

activesupport/lib/active_support/translation.rb

@@ +1 @@
+require 'active_support/translation/translatable_string'
+require 'active_support/translation/translatable_time'
+require 'active_support/translation/translatable_date'
+require 'active_support/translation/translatable_date_time'

activesupport/lib/active_support/core_ext/date_time/translation.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module DateTime #:nodoc:
+      # Define methods for handeling translation of strings.
+      module Translation
+        def t
+          ActiveSupport::Translation::TranslatableDateTime.civil(self.year,self.mon, self.mday, self.hour, self.min, self.sec)
+        end
+      end
+    end    
+  end
+end

activesupport/lib/active_support/core_ext/date_time.rb

@@ -2 +2 @@
-require "#{File.dirname(__FILE__)}/time/behavior"
-require "#{File.dirname(__FILE__)}/date_time/calculations"
-require "#{File.dirname(__FILE__)}/date_time/conversions"
+require "#{File.dirname(__FILE__)}/date_time/translation"
-
-class DateTime
-  include ActiveSupport::CoreExtensions::Time::Behavior
-  include ActiveSupport::CoreExtensions::DateTime::Calculations
-  include ActiveSupport::CoreExtensions::DateTime::Conversions
+  include ActiveSupport::CoreExtensions::DateTime::Translation
-end

activesupport/lib/active_support/core_ext/time/translation.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Time #:nodoc:
+      # Define methods for handeling translation of times.
+      module Translation
+        def t
+          ActiveSupport::Translation::TranslatableTime.at(self)
+        end
+      end
+    end
+  end
+end

activesupport/lib/active_support/core_ext/time/conversions.rb

@@ -24 +24 @@
-            if formatter.respond_to?(:call)
-              formatter.call(self).to_s
-            else
-
+.strip
-            end
-          else
-            to_default_s

activesupport/lib/active_support/core_ext/object.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/object/extending'
-
-
+

activesupport/lib/active_support/core_ext/string.rb

@@ -4 +4 @@
-require File.dirname(__FILE__) + '/string/starts_ends_with'
-require File.dirname(__FILE__) + '/string/iterators' unless 'test'.respond_to?(:each_char)
-require File.dirname(__FILE__) + '/string/unicode'
+require File.dirname(__FILE__) + '/string/translation'
-
-class String #:nodoc:
-  include ActiveSupport::CoreExtensions::String::Access
@@ -14 +15 @@
-    include ActiveSupport::CoreExtensions::String::Iterators
-  end
-  include ActiveSupport::CoreExtensions::String::Unicode
+  include ActiveSupport::CoreExtensions::String::Translation
-end

activesupport/lib/active_support/core_ext/date/translation.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Date #:nodoc:
+      # Define methods for handeling translation of strings.
+      module Translation
+        def t
+          ActiveSupport::Translation::TranslatableDate.new(self.year,self.mon, self.mday)
+        end
+      end
+    end    
+  end
+end

activesupport/lib/active_support/core_ext/date/conversions.rb

@@ -17 +17 @@
-            alias_method :to_s, :to_formatted_s
-            alias_method :default_inspect, :inspect
-            alias_method :inspect, :readable_inspect
-
-            # Ruby 1.9 has Date#to_time which converts to localtime only.
-            remove_method :to_time if base.instance_methods.include?(:to_time)
-          end
-        end
-
@@ -28 +25 @@
-            if formatter.respond_to?(:call)
-              formatter.call(self).to_s
-            else
-
+.strip
-            end
-          else
-            to_default_s
-          end
-        end
-
+
-        # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
-        def readable_inspect
-          strftime("%a, %d %b %Y")
@@ -43 +40 @@
-        # To be able to keep Times, Dates and DateTimes interchangeable on conversions
-        def to_date
-          self
- if RUBY_VERSION < '1.9'
+
-
-        # Converts self to a Ruby Time object; time is set to beginning of day
-        # Timezone can either be :local or :utc  (default :local)
-        def to_time(form = :local)
-          ::Time.send("#{form}_time", year, month, day)
-        end
-
+
-        # Converts self to a Ruby DateTime object; time is set to beginning of day
-        def to_datetime
-          ::DateTime.civil(year, month, day, 0, 0, 0, 0, 0)
- if RUBY_VERSION < '1.9'
+
-
-        def xmlschema
-          to_time.xmlschema

activesupport/lib/active_support/core_ext/date.rb

@@ -2 +2 @@
-require File.dirname(__FILE__) + '/date/behavior'
-require File.dirname(__FILE__) + '/date/calculations'
-require File.dirname(__FILE__) + '/date/conversions'
+require File.dirname(__FILE__) + '/date/translation'
-
-class Date#:nodoc:
-  include ActiveSupport::CoreExtensions::Date::Behavior
-  include ActiveSupport::CoreExtensions::Date::Calculations
-  include ActiveSupport::CoreExtensions::Date::Conversions
+  include ActiveSupport::CoreExtensions::Date::Translation
-end

activesupport/lib/active_support/core_ext/time.rb

@@ -11 +11 @@
-require File.dirname(__FILE__) + '/time/behavior'
-require File.dirname(__FILE__) + '/time/calculations'
-require File.dirname(__FILE__) + '/time/conversions'
+require File.dirname(__FILE__) + '/time/translation'
-
-class Time#:nodoc:
-  include ActiveSupport::CoreExtensions::Time::Behavior
-  include ActiveSupport::CoreExtensions::Time::Calculations
-  include ActiveSupport::CoreExtensions::Time::Conversions
+  include ActiveSupport::CoreExtensions::Time::Translation
-end

activesupport/lib/active_support/core_ext/string/translation.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Define methods for handeling translation of strings.
+      module Translation
+        def t(*args)
+          ActiveSupport::Translation::TranslatableString.translate(self, args)
+        end
+      end
+    end    
+  end
+end

activesupport/lib/active_support.rb

@@ -46 +46 @@
-
-require 'active_support/multibyte'
-
+require 'active_support/translation'
+

activerecord/test/validations_test.rb

@@ -25 +25 @@
-  fixtures :topics, :developers
-
-  def setup
+    
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableString
+        def self.overidden_translate(string, args)
+          DefaultTranslatableString.translate(string, args)
+        end
+        
+        class << self
+          alias_method :old_translate, :translate        
+          alias_method :translate, :overidden_translate
+        end
+      end      
+    ENDDEF
+        
-    Topic.write_inheritable_attribute(:validate, nil)
-    Topic.write_inheritable_attribute(:validate_on_create, nil)
-    Topic.write_inheritable_attribute(:validate_on_update, nil)
-  end
+  
+  def tear_down
+    Object.class_eval <<-ENDDEF
+      class ::ActiveSupport::Translation::TranslatableString
+        class << self
+          alias_method :translate, :old_translate
+        end
+      end      
+    ENDDEF
+        
+  end
-
-  def test_single_field_validation
-    r = Reply.new
@@ -130 +155 @@
-    r.save
-
-    errors = []
-
-
+
+
+
+
+
-    assert errors.include?(["title", "Empty"])
-    assert errors.include?(["content", "Empty"])
-  end
@@ -160 +188 @@
-    r.errors.each_full { |error| errors << error }
-
-    assert_equal "Reply is not dignifying", r.errors.on_base
-
-    assert errors.include?("Title Empty")
-    assert errors.include?("Reply is not dignifying")
-    assert_equal 2, r.errors.count

activerecord/lib/active_record/validations.rb

@@ -10 +10 @@
-    attr_reader :record
-    def initialize(record)
-      @record = record
-#{@record.errors.full_messages.join(", ")}"
+%s".t(@record.errors.full_messages.join(", "))
-    end
-  end
-
@@ -52 +52 @@
-    # Adds an error to the base object instead of any particular attribute. This is used
-    # to report errors that don't tie to any specific attribute, but rather to the object
-    # as a whole. These error messages don't get prepended with any field name when iterating
-
-
-
+
+
+
+
-    end
-
-    # Adds an error message (+msg+) to the +attribute+, which will be returned on a call to <tt>on(attribute)</tt>
-    # for the same attribute and ensure that this error object returns false when asked if <tt>empty?</tt>. More than one
-    # error can be added to the same +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
-
-
+
+
+
-      @errors[attribute.to_s] = [] if @errors[attribute.to_s].nil?
-msg
+[ msg, num ]
-    end
-
-    # Will add an error message to each of the attributes in +attributes+ that is empty.
@@ -111 +113 @@
-    #   company.errors.on(:email)     # => "can't be blank"
-    #   company.errors.on(:address)   # => nil
-    def on(attribute)
-
-
-
+
+
+
+
+
+
+
-    end
-
-    alias :[] :on
@@ -172 +178 @@
-      @errors.each_key do |attr|
-        @errors[attr].each do |msg|
-          next if msg.nil?
-
+
+
+
+
+
-          if attr == "base"
-
+_text.t(msg_num)
-          else
-@base.class.human_attribute_name(attr) + " " + msg
+(("#{@base.class.human_attribute_name(attr)} #{msg_text}").t(msg_num))
-          end
-        end
-      end
@@ -546 +556 @@
-          when :within, :in
-            raise ArgumentError, ":#{option} must be a Range" unless option_value.is_a?(Range)
-
- % option_value.begin
-  % option_value.end
+
+
-
-            validates_each(attrs, options) do |record, attr, value|
+              
-              if value.nil? or value.split(//).size < option_value.begin
-
+, option_value.begin
-              elsif value.split(//).size > option_value.end
-
+, option_value.end
-              end
-            end
-          when :is, :minimum, :maximum
@@ -563 +574 @@
-            validity_checks = { :is => "==", :minimum => ">=", :maximum => "<=" }
-            message_options = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }
-
- % option_value
+
-
-            validates_each(attrs, options) do |record, attr, value|
-              if value.kind_of?(String)
-
+, option_value
-              else
-
+, option_value
-              end
-            end
-        end

actionpack/lib/action_view/helpers/active_record_helper.rb

@@ -118 +118 @@
-      # you need is significantly different from the default presentation, it makes plenty of sense to access the object.errors
-      # instance yourself and set it up. View the source of this method to see how easy it is.
-      def error_messages_for(*params)
-extract_options!.symbolize_keys
+last.is_a?(Hash) ? params.pop.symbolize_keys : {}
-        objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
-        count   = objects.inject(0) {|sum, object| sum + object.errors.count }
-        unless count.zero?
@@ -131 +131 @@
-              html[key] = 'errorExplanation'
-            end
-          end
-#{pluralize(count, 'error')} prohibited this #{(options[:object_name] || params.first).to_s.gsub('_', ' ')} from being saved"
+%d errors prohibited this #{(options[:object_name] || params.first).to_s.gsub('_', ' ')} from being saved".t(count)
-          error_messages = objects.map {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }
-          content_tag(:div,
-            content_tag(options[:header_tag] || :h2, header_message) <<
-
+.t
-              content_tag(:ul, error_messages),
-            html
-          )

actionpack/lib/action_view/helpers/date_helper.rb

@@ -65 +65 @@
-
-        case distance_in_minutes
-          when 0..1
- == 0) ? 'less than a minute' : '1 minute'
+==0) ? 'less than a minute'.t : ('%d minutes'.t 1)
-            case distance_in_seconds
-5 seconds'
- then 'less than 10 seconds'
-20 seconds'
-
-
-1 minute'
+%d seconds'.t 5
+then 'less than %d seconds'.t 10
+%d seconds'.t 20
+.t
+.t
+%d minutes'.t 1
-            end
-
-"#{distance_in_minutes} minutes"
-1 hour'
-"about #{(distance_in_minutes.to_f / 60.0).round} hours"
-1 day'
-"#{(distance_in_minutes / 1440).round} days"
-1 month'
-"#{(distance_in_minutes / 43200).round} months"
-1 year'
-"over #{(distance_in_minutes / 525600).round} years"
+'%d minutes'.t distance_in_minutes
+%d hours'.t 1
+'about %d hours'.t((distance_in_minutes.to_f / 60.0).round)
+%d days'.t 1
+'%d days'.t((distance_in_minutes / 1440).round)
+%d months'.t 1
+'%d months'.t((distance_in_minutes / 43200).round)
+%d years'.t 1
+'over %d years'.t((distance_in_minutes / 525600).round)
-        end
-      end
-
@@ -495 +495 @@
-            end
-
-            month_options << ((val == month_number) ?
-
-
+.to_s.t
+.to_s.t
-            )
-          end
-          select_html(options[:field_name] || 'month', month_options, options)