diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-04-15 13:30:21 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-04-15 13:30:21 +0100 |
| commit | 7dea4b57a48e1bef70bcd8ae9a804bce09865bae (patch) | |
| tree | 15498458d8f0707dded15ed55832c622670835b8 | |
| parent | 65469a6e5e8cd2418c99c3862dd33feed69536bd (diff) | |
| parent | dd90f3923c34549815a8f0ddb331eddfb8122868 (diff) | |
| download | rails-7dea4b57a48e1bef70bcd8ae9a804bce09865bae.tar.gz rails-7dea4b57a48e1bef70bcd8ae9a804bce09865bae.tar.bz2 rails-7dea4b57a48e1bef70bcd8ae9a804bce09865bae.zip | |
Merge branch 'master' of github.com:rails/rails
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 9025d9e24c..440acafa88 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -610,10 +610,11 @@ 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: - # attribute: + # activerecord: + # attributes: # post: # cost: "Total cost" # |