summaryrefslogtreecommitdiffstats
path: root/lib/redmine/views
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-06-04 02:26:48 +0000
committerGo MAEDA <maeda@farend.jp>2018-06-04 02:26:48 +0000
commitdb8afc99e138c89b8824ab60cd1a6edbf8447734 (patch)
tree2b3c82c6b41a61ef6bb055156da5133de70e35e5 /lib/redmine/views
parentc7d52e7c55f2824d181b28f5e064eef0fd00a68b (diff)
downloadredmine-db8afc99e138c89b8824ab60cd1a6edbf8447734.tar.gz
redmine-db8afc99e138c89b8824ab60cd1a6edbf8447734.zip
Support of default ActiveRecord I18n scopes in LabelledFormBuilder (#26618).
Patch by Dmitry Lisichkin. git-svn-id: http://svn.redmine.org/redmine/trunk@17365 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/views')
-rw-r--r--lib/redmine/views/labelled_form_builder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/views/labelled_form_builder.rb b/lib/redmine/views/labelled_form_builder.rb
index 7481d79b8..d7aff9a6b 100644
--- a/lib/redmine/views/labelled_form_builder.rb
+++ b/lib/redmine/views/labelled_form_builder.rb
@@ -55,7 +55,7 @@ class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder
def label_for_field(field, options = {})
return ''.html_safe if options.delete(:no_label)
text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
- text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
+ text ||= @object.class.human_attribute_name(field)
text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
@template.content_tag("label", text.html_safe,
:class => (@object && @object.errors[field].present? ? "error" : nil),