diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-07 02:19:55 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-07 15:31:50 +0100 |
| commit | c68cc49dcde6c7df4c11a1113fcd0d47220cddd3 (patch) | |
| tree | 40fb850eab70d9e2b1c068c6bf5169094098350e /actionpack/lib/action_view | |
| parent | a091e2e4f6472d2f9f9396284f94e4e299a1ecb3 (diff) | |
| download | rails-c68cc49dcde6c7df4c11a1113fcd0d47220cddd3.tar.gz rails-c68cc49dcde6c7df4c11a1113fcd0d47220cddd3.tar.bz2 rails-c68cc49dcde6c7df4c11a1113fcd0d47220cddd3.zip | |
Use helpers.label instead of views.labels.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/locale/en.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 81c9c88820..da33f24c54 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -777,7 +777,7 @@ module ActionView options["for"] ||= name_and_id["id"] content = if text.blank? - I18n.t("views.labels.#{object_name}.#{method_name}", :default => "").presence + I18n.t("helpers.label.#{object_name}.#{method_name}", :default => "").presence else text.to_s end diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 935ab5f3e8..02ad637509 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -571,7 +571,7 @@ module ActionView option_tags = "<option value=\"\">#{options[:include_blank] if options[:include_blank].kind_of?(String)}</option>\n" + option_tags end if value.blank? && options[:prompt] - prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('support.select.prompt', :default => 'Please select') + prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('helpers.select.prompt', :default => 'Please select') "<option value=\"\">#{prompt}</option>\n" + option_tags else option_tags diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml index b5db998049..9918034020 100644 --- a/actionpack/lib/action_view/locale/en.yml +++ b/actionpack/lib/action_view/locale/en.yml @@ -110,7 +110,7 @@ # The variable :count is also available body: "There were problems with the following fields:" - support: + helpers: select: # default value for :prompt => true in FormOptionsHelper prompt: "Please select" |