kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Do not enforce human_attribute_name as required API.

This commit is contained in:
José Valim 2009-12-31 14:31:03 +01:00
parent bef968d379
commit f50bb48e04
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actionpack/lib/action_view/helpers/form_helper.rb
View File

@ -777,12 +777,15 @@ module ActionView
options["for"] ||= name_and_id["id"]
content = if text.blank?
i18n_label = I18n.t("views.labels.#{object_name}.#{method_name}", :default => "")
i18n_label if i18n_label.present?
I18n.t("views.labels.#{object_name}.#{method_name}", :default => "").presence
else
text.to_s
end
content ||= object.class.human_attribute_name(method_name) if object
content ||= if object && object.class.respond_to?(:human_attribute_name)
object.class.human_attribute_name(method_name)
end
content ||= method_name.humanize
label_tag(name_and_id["id"], content, options)