From ddf4c953ae8d10489e0bfd6008bd76395f6e1267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 5 Mar 2016 17:26:04 -0300
Subject: Revert "Merge pull request #22764 from
 stevenspiel/titleize_model_name_for_default_submit_button_value"

This reverts commit 4158974c60d817c9bc1e2aecb342161295f2ac0d, reversing
changes made to 3d590add45b7ff1de972d99b076cb504d5208935.

Reason: This break i18n in some languages. See
https://github.com/rails/rails/issues/791#issuecomment-192724640
---
 actionview/lib/action_view/helpers/form_helper.rb |  2 --
 actionview/test/lib/controller/fake_models.rb     | 21 --------------------
 actionview/test/template/form_helper_test.rb      | 24 +++--------------------
 3 files changed, 3 insertions(+), 44 deletions(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index c1015ffe89..e91b3443c5 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -1922,8 +1922,6 @@ module ActionView
             @object_name.to_s.humanize
           end
 
-          model = model.downcase
-
           defaults = []
           defaults << :"helpers.submit.#{object_name}.#{key}"
           defaults << :"helpers.submit.#{key}"
diff --git a/actionview/test/lib/controller/fake_models.rb b/actionview/test/lib/controller/fake_models.rb
index a122fe17c9..65c68fc34a 100644
--- a/actionview/test/lib/controller/fake_models.rb
+++ b/actionview/test/lib/controller/fake_models.rb
@@ -31,27 +31,6 @@ end
 class GoodCustomer < Customer
 end
 
-class TicketType < Struct.new(:name)
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-  extend ActiveModel::Translation
-
-  def initialize(*args)
-    super
-    @persisted = false
-  end
-
-  def persisted=(boolean)
-    @persisted = boolean
-  end
-
-  def persisted?
-    @persisted
-  end
-
-  attr_accessor :name
-end
-
 class Post < Struct.new(:title, :author_name, :body, :secret, :persisted, :written_on, :cost)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 034b8a4bf6..e77183e39f 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -128,8 +128,6 @@ class FormHelperTest < ActionView::TestCase
     @post_delegator.title = 'Hello World'
 
     @car = Car.new("#000FFF")
-
-    @ticket_type = TicketType.new
   end
 
   Routes = ActionDispatch::Routing::RouteSet.new
@@ -138,8 +136,6 @@ class FormHelperTest < ActionView::TestCase
       resources :comments
     end
 
-    resources :ticket_types
-
     namespace :admin do
       resources :posts do
         resources :comments
@@ -1876,20 +1872,6 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_lowercase_model_name_default_submit_button_value
-    form_for(@ticket_type) do |f|
-      concat f.submit
-    end
-
-    expected =
-      '<form class="new_ticket_type" id="new_ticket_type" action="/ticket_types" accept-charset="UTF-8" method="post">' +
-        hidden_fields +
-        '<input type="submit" name="commit" value="Create ticket type" data-disable-with="Create ticket type" />' +
-      '</form>'
-
-    assert_dom_equal expected, output_buffer
-  end
-
   def test_form_for_with_symbol_object_name
     form_for(@post, as: "other_name", html: { id: "create-post" }) do |f|
       concat f.label(:title, class: 'post_title')
@@ -2257,7 +2239,7 @@ class FormHelperTest < ActionView::TestCase
         end
 
         expected = whole_form('/posts', 'new_post', 'new_post') do
-          "<input name='commit' data-disable-with='Create post' type='submit' value='Create post' />"
+          "<input name='commit' data-disable-with='Create Post' type='submit' value='Create Post' />"
         end
 
         assert_dom_equal expected, output_buffer
@@ -2272,7 +2254,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Confirm post changes' type='submit' value='Confirm post changes' />"
+      "<input name='commit' data-disable-with='Confirm Post changes' type='submit' value='Confirm Post changes' />"
       end
 
       assert_dom_equal expected, output_buffer
@@ -2300,7 +2282,7 @@ class FormHelperTest < ActionView::TestCase
       end
 
       expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
-      "<input name='commit' data-disable-with='Update your post' type='submit' value='Update your post' />"
+      "<input name='commit' data-disable-with='Update your Post' type='submit' value='Update your Post' />"
       end
 
       assert_dom_equal expected, output_buffer
-- 
cgit v1.2.3