diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-02-26 22:30:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 22:30:32 -0500 |
| commit | f86b221a53e8363b7c8a5688df603fc388b62b7c (patch) | |
| tree | d58108de27b0e393f58b00ad13d414d1a917fa3a /actionview/lib/action_view | |
| parent | 19460585d56f78b1a7b61c1ffa9900a331df2780 (diff) | |
| parent | e579c7430ab94d1bf31b91d3973b26ab69c8503c (diff) | |
| download | rails-f86b221a53e8363b7c8a5688df603fc388b62b7c.tar.gz rails-f86b221a53e8363b7c8a5688df603fc388b62b7c.tar.bz2 rails-f86b221a53e8363b7c8a5688df603fc388b62b7c.zip | |
Merge pull request #26799 from deraru/support-i18n-key-in-submit-tag
Support i18n key at translation of value in submit tag
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index 15aa9ec2dd..e27628f58b 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -2266,7 +2266,12 @@ module ActionView end defaults = [] - defaults << :"helpers.submit.#{object_name}.#{key}" + # Object is a model and it is not overwritten by as and scope option. + if object.respond_to?(:model_name) && object_name.to_s == model.downcase + defaults << :"helpers.submit.#{object.model_name.i18n_key}.#{key}" + else + defaults << :"helpers.submit.#{object_name}.#{key}" + end defaults << :"helpers.submit.#{key}" defaults << "#{key.to_s.humanize} #{model}" |