@@ -27,9 +27,10 @@ module Globalize self.globalize_proxy = Globalize::Model::ActiveRecord.create_proxy_class(self) has_many( :globalize_translations, - :class_name => globalize_proxy.name, - :extend => Extensions, - :dependent => :delete_all + :class_name => globalize_proxy.name, + :extend => Extensions, + :dependent => :delete_all, + :foreign_key => class_name.foreign_key ) after_save :update_globalize_record lib/globalize/model/active_record/translated.rb @@ -12,4 +12,13 @@ class Parent < ActiveRecord::Base end class Child < Parent +end + +class Comment < ActiveRecord::Base + validates_presence_of :content + belongs_to :post +end + +class TranslatedComment < Comment + translates :content end \ No newline at end of file test/data/post.rb @@ -25,5 +25,15 @@ ActiveRecord::Schema.define do t.string :type end -end + create_table :comments, :force => true do |t| + t.references :post + end + + create_table :translated_comment_translations, :force => true do |t| + t.string :locale + t.references :comment + t.string :subject + t.text :content + end +end \ No newline at end of file test/data/schema.rb @@ -426,6 +426,27 @@ class TranslatedTest < ActiveSupport::TestCase p.destroy assert_equal 0, PostTranslation.count end + + test "translating subclass of untranslated comment model" do + translated_comment = TranslatedComment.create(:post => @post) + assert_nothing_raised { translated_comment.globalize_translations } + end + + test "modifiying translated comments works as expected" do + I18n.locale = :en + translated_comment = TranslatedComment.create(:post => @post, :content => 'foo') + assert_equal 'foo', translated_comment.content + + I18n.locale = :de + translated_comment.content = 'bar' + assert translated_comment.save + assert_equal 'bar', translated_comment.content + + I18n.locale = :en + assert_equal 'foo', translated_comment.content + + assert_equal 2, translated_comment.globalize_translations.size + end end # TODO should validate_presence_of take fallbacks into account? maybe we need test/model/active_record/translated_test.rb 0eef3b82561d3d2bfa7f604b1fa6f9f44c2616b6 hukl contact@smyck.org http://github.com/joshmh/globalize2/commit/315ae9dde1c5550d331ca7ab7ea6bc83e3882f32 315ae9dde1c5550d331ca7ab7ea6bc83e3882f32 2009-04-29T11:58:04-07:00 2009-04-29T11:58:04-07:00 This patch makes sure globalize2 behaves as expected when a subclass of an untranslated model is translated. class Comment < ActiveRecord::Base end class TranslatedComment < Comment translates :content end 2bd86ffebb18771677bfb129f6a9552bb23bb815 hukl contact@smyck.org