aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 15:27:27 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 15:27:27 -0200
commit96be4f65d0f68ae948f5665bc09bd3c69955be89 (patch)
tree79bb15bb214bb4197877b73e1ae41ca1f49addf5
parented853488775296eb6861751e9b2993dfd7e8c765 (diff)
downloadrails-96be4f65d0f68ae948f5665bc09bd3c69955be89.tar.gz
rails-96be4f65d0f68ae948f5665bc09bd3c69955be89.tar.bz2
rails-96be4f65d0f68ae948f5665bc09bd3c69955be89.zip
placeholder doesn't exist inside this context
-rw-r--r--actionview/lib/action_view/helpers/tags/translator.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/tags/translator.rb b/actionview/lib/action_view/helpers/tags/translator.rb
index b626dfab3b..9cdccaf4aa 100644
--- a/actionview/lib/action_view/helpers/tags/translator.rb
+++ b/actionview/lib/action_view/helpers/tags/translator.rb
@@ -12,8 +12,8 @@ module ActionView
end
def call
- placeholder ||= I18n.t("#{object_name}.#{method_and_value}", :default => i18n_default, :scope => i18n_scope).presence
- placeholder || human_attribute_name
+ translated_attribute = I18n.t("#{object_name}.#{method_and_value}", :default => i18n_default, :scope => i18n_scope).presence
+ translated_attribute || human_attribute_name
end
def i18n_default