aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/cases/translation_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-05 15:39:41 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-05 15:39:41 +0100
commitd4964b338667fb14d7755cd90af88bb267238958 (patch)
tree5dc5ca1004da0db180daac96af1a01659b431322 /activemodel/test/cases/translation_test.rb
parent2985151000b9949474b8b575e25bf7ced387da02 (diff)
downloadrails-d4964b338667fb14d7755cd90af88bb267238958.tar.gz
rails-d4964b338667fb14d7755cd90af88bb267238958.tar.bz2
rails-d4964b338667fb14d7755cd90af88bb267238958.zip
Namespaced attribute lookup now works as 'model/association.attribute'.
Diffstat (limited to 'activemodel/test/cases/translation_test.rb')
-rw-r--r--activemodel/test/cases/translation_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index c3d60d6c8b..54e86d48db 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -57,13 +57,13 @@ class ActiveModelI18nTests < ActiveModel::TestCase
end
def test_translated_nested_model_attributes
- I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:"addresses/street" => 'Street'}}}
- assert_equal 'Street', Person.human_attribute_name('addresses.street')
+ I18n.backend.store_translations 'en', :activemodel => {:attributes => {:"person/addresses" => {:street => 'Person Address Street'}}}
+ assert_equal 'Person Address Street', Person.human_attribute_name('addresses.street')
end
- def test_translated_nested_model_attributes_with_deprecated_lookup_style
- I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:addresses => {:street => 'Street'}}}}
- assert_equal 'Street', Person.human_attribute_name('addresses.street')
+ def test_translated_nested_model_attributes_with_namespace_fallback
+ I18n.backend.store_translations 'en', :activemodel => {:attributes => {:addresses => {:street => 'Cool Address Street'}}}
+ assert_equal 'Cool Address Street', Person.human_attribute_name('addresses.street')
end
def test_translated_model_names