From c8c012caa8e5a379ed050fb4150fc1b57930fbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 14 Apr 2011 23:37:35 -0700
Subject: Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub

---
 actionpack/lib/action_view/helpers/form_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 9025d9e24c..68722b8214 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -610,9 +610,10 @@ module ActionView
       #   label(:post, :body)
       #   # => <label for="post_body">Write your entire text here</label>
       #
-      #   Localization can also be based purely on the translation of the attribute-name like this:
+      # Localization can also be based purely on the translation of the attribute-name
+      # (if you are using ActiveRecord):
       #
-      #   activemodel:
+      #   activerecord:
       #     attribute:
       #       post:
       #         cost: "Total cost"
-- 
cgit v1.2.3


From dd90f3923c34549815a8f0ddb331eddfb8122868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 14 Apr 2011 23:40:56 -0700
Subject: attribute should be attributes

---
 actionpack/lib/action_view/helpers/form_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 68722b8214..440acafa88 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -614,7 +614,7 @@ module ActionView
       # (if you are using ActiveRecord):
       #
       #   activerecord:
-      #     attribute:
+      #     attributes:
       #       post:
       #         cost: "Total cost"
       #
-- 
cgit v1.2.3