diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-06 20:22:42 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-06 20:22:42 -0200 |
| commit | 4afb55f4e77d035826c0fba1983386aa03cda90e (patch) | |
| tree | 29f5023dd29b18b0941fcbc9b9025e7e91b9b309 /actionview/lib | |
| parent | 254693a39c73b6fc9ad71b47b4d652e8738bec12 (diff) | |
| parent | be0875f4580749c2c5ad84086f2e890ddeba7de8 (diff) | |
| download | rails-4afb55f4e77d035826c0fba1983386aa03cda90e.tar.gz rails-4afb55f4e77d035826c0fba1983386aa03cda90e.tar.bz2 rails-4afb55f4e77d035826c0fba1983386aa03cda90e.zip | |
Merge pull request #18834 from mfazekas/fix-i18-for-openstruct
Fixed undefined method `i18n_key' for nil:NilClass for labels in non AR ...
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/tags/translator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/tags/translator.rb b/actionview/lib/action_view/helpers/tags/translator.rb index 829679851c..e70fe024e8 100644 --- a/actionview/lib/action_view/helpers/tags/translator.rb +++ b/actionview/lib/action_view/helpers/tags/translator.rb @@ -6,7 +6,7 @@ module ActionView @object_name = object_name.gsub(/\[(.*)_attributes\]\[\d+\]/, '.\1') @method_and_value = method_and_value @scope = scope - @model = object.respond_to?(:to_model) ? object.to_model : object + @model = object.respond_to?(:to_model) ? object.to_model : nil end def translate |