engines/adva_cms/db/migrate/20090702085459_create_section_translations.rb @@ -2,6 +2,7 @@ class Section < ActiveRecord::Base @@types = ['Page'] cattr_reader :types + translates :title serialize :permissions has_option :contents_per_page, :default => 15 engines/adva_cms/app/models/section.rb @@ -22,6 +22,19 @@ namespace :adva do puts comp_keys - base_keys end end + + desc "Migrate section titles. Specify e.g., LOCALE=de if app locale isn't en." + task :migrate_sections => :environment do + locale = ENV['locale'] || 'en' + sql = %{ + INSERT INTO section_translations (section_id, locale, title, created_at, updated_at) + SELECT sections.id, "#{locale}", sections.title, sections.published_at, sections.published_at + FROM sections + } + ActiveRecord::Base.connection.insert sql, "migrating sections to globalize" + ActiveRecord::Base.connection.remove_column 'sections', 'title' + Rake::Task['db:schema:dump'].invoke + end end end engines/adva_cms/lib/tasks/translation.rake @@ -120,6 +120,11 @@ class BaseHelperMicroformatsTest < ActiveSupport::TestCase @local_time = Time.zone.local 2008, 10, 9, 14, 0, 0 end + def teardown + super + Time.zone = 'UTC' + end + # DATETIME MICROFORMAT HELPERS test "#datetime_with_microformat displays the passed object when passed a non-Date/Time object" do engines/adva_cms/test/unit/helpers/base_helper_test.rb @@ -109,7 +109,7 @@ module Globalize end module InstanceMethods - def reload_with_globalize + def reload_with_globalize(options = nil) globalize.clear # clear all globalized attributes @@ -118,9 +118,13 @@ module Globalize @attributes.delete attr.to_s end - reload_without_globalize + reload_without_globalize(options) end + def translated_attributes + self.class.globalize_options[:translated_attributes].inject({}) {|h, tf| h[tf] = send(tf); h } + end + def globalize @globalize ||= Adapter.new self end engines/adva_cms/vendor/plugins/globalize2/lib/globalize/model/active_record/translated.rb @@ -20,10 +20,10 @@ module With def it_updates(*names) names.each do |name| - before { record_before_state("@#{name}.attributes") } + before { record_before_state("all_attributes(@#{name})") } assertion "it updates #{name}" do - previous = @before_states["@#{name}.attributes"] - current = assigns(name).reload.attributes + previous = @before_states["all_attributes(@#{name})"] + current = all_attributes(assigns(name).reload) assert_not_equal previous, current, "expected #{name} to be updated, but wasn't" end end @@ -125,6 +125,13 @@ module With @before_states[expression] = instance_eval(expression) end + # merges in translated attributes, if present + def all_attributes(model) + model.respond_to?(:translated_attributes) ? + model.attributes.merge( model.translated_attributes ) : + model.attributes + end + def assert_state_change(expression, difference, message = nil) expected = @before_states[expression] + difference result = instance_eval(expression) test/with-sugar/lib/with-sugar/model.rb 14fef3be89bdc1d75e470bbb523d346c1037f7fc Joshua Harvey joshmh@gmail.com http://github.com/svenfuchs/adva_cms/commit/2e97c397f3fa9a1c91b075e9eae461949f8c9162 2e97c397f3fa9a1c91b075e9eae461949f8c9162 2009-07-02T05:45:37-07:00 2009-07-02T05:45:37-07:00 translated section titles; all tests pass 917600d5f800918332bc1f8859a1a62326ca7c3d Joshua Harvey joshmh@gmail.com