actionpack 3.1.2 → 3.1.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Rails 3.1.3 (unreleased) ##
+
+*   Downgrade sprockets to ~> 2.0.3. Using 2.1.0 caused regressions.
+
+*   Fix using `tranlate` helper with a html translation which uses the `:count` option for
+    pluralization.
+
+    *Jon Leighton*
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Fix XSS security vulnerability in the `translate` helper method. When using interpolation

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/action_view/helpers/form_helper.rb

@@ -983,8 +983,16 @@ module ActionView
           label_tag(name_and_id["id"], options, &block)
         else
           content = if text.blank?
+            object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
             method_and_value = tag_value.present? ? "#{method_name}.#{tag_value}" : method_name
-            I18n.t("helpers.label.#{object_name}.#{method_and_value}", :default => "").presence
+
+            if object.respond_to?(:to_model)
+              key = object.class.model_name.i18n_key
+              i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
+            end
+
+            i18n_default ||= ""
+            I18n.t("#{object_name}.#{method_and_value}", :default => i18n_default, :scope => "helpers.label").presence
           else
             text.to_s
           end

data/lib/action_view/helpers/translation_helper.rb

@@ -48,7 +48,9 @@ module ActionView
         if html_safe_translation_key?(key)
           html_safe_options = options.dup
           options.except(*I18n::RESERVED_KEYS).each do |name, value|
-            html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            unless name == :count && value.is_a?(Numeric)
+              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            end
           end
           translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-cache
@@ -152,12 +152,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 2
-        - 1
         - 0
-        version: 2.1.0
+        - 3
+        version: 2.0.3
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: erubis