Use human_name in scaffold.

railties/lib/generators/erb/scaffold/templates/index.html.erb

@@ -24,4 +24,4 @@
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to 'New <%= human_name %>', new_<%= singular_name %>_path %>

railties/lib/generators/rails/scaffold_controller/templates/controller.rb

@@ -46,7 +46,7 @@ def create
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully created.') }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= human_name %> was successfully created.') }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
         format.html { render :action => "new" }
@@ -62,7 +62,7 @@ def update
 
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{file_name}]") %>
-        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully updated.') }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= human_name %> was successfully updated.') }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }

railties/lib/rails/generators/named_base.rb

@@ -27,6 +27,10 @@ def class_name
           @class_name ||= (class_path + [file_name]).map!{ |m| m.camelize }.join('::')
         end
 
+        def human_name
+          @human_name ||= singular_name.humanize
+        end
+
         def plural_name
           @plural_name ||= singular_name.pluralize
         end

railties/test/generators/named_base_test.rb

@@ -15,6 +15,20 @@ class NamedBaseTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   tests Rails::Generators::ScaffoldControllerGenerator
 
+  def test_named_generator_with_underscore
+    g = generator ['line_item']
+    assert_name g, 'line_item',  :name
+    assert_name g, %w(),         :class_path
+    assert_name g, 'LineItem',   :class_name
+    assert_name g, 'line_item',  :file_path
+    assert_name g, 'line_item',  :file_name
+    assert_name g, 'Line item',  :human_name
+    assert_name g, 'line_item',  :singular_name
+    assert_name g, 'line_items', :plural_name
+    assert_name g, 'line_item',  :i18n_scope
+    assert_name g, 'line_items', :table_name
+  end
+
   def test_named_generator_attributes
     g = generator ['admin/foo']
     assert_name g, 'admin/foo',  :name
@@ -22,6 +36,7 @@ def test_named_generator_attributes
     assert_name g, 'Admin::Foo', :class_name
     assert_name g, 'admin/foo',  :file_path
     assert_name g, 'foo',        :file_name
+    assert_name g, 'Foo',        :human_name
     assert_name g, 'foo',        :singular_name
     assert_name g, 'foos',       :plural_name
     assert_name g, 'admin.foo',  :i18n_scope
@@ -36,6 +51,7 @@ def test_named_generator_attributes_as_ruby
     assert_name g, 'admin/foo',  :file_path
     assert_name g, 'foo',        :file_name
     assert_name g, 'foo',        :singular_name
+    assert_name g, 'Foo',        :human_name
     assert_name g, 'foos',       :plural_name
     assert_name g, 'admin.foo',  :i18n_scope
     assert_name g, 'admin_foos', :table_name
@@ -45,6 +61,8 @@ def test_named_generator_attributes_without_pluralized
     ActiveRecord::Base.pluralize_table_names = false
     g = generator ['admin/foo']
     assert_name g, 'admin_foo', :table_name
+  ensure
+    ActiveRecord::Base.pluralize_table_names = true
   end
 
   def test_scaffold_plural_names