@@ -59,16 +59,22 @@ module Globalize default = options.delete(:default) result = backends.inject({}) do |namespace, backend| begin - translation = backend.translate(locale.to_sym, key, options) + translation = backend.translate(locale, key, options) if namespace_lookup?(translation, options) namespace.merge! translation elsif translation return translation end rescue I18n::MissingTranslationData + namespace end end - result || default(locale, default, options) || raise(I18n::MissingTranslationData.new(locale, key, options)) + + if result.blank? + default(locale, default, options) || raise(I18n::MissingTranslationData.new(locale, key, options)) + else + result + end end def localize(locale, object, format = :default) lib/globalize/backend/chain.rb @@ -1,19 +1,50 @@ -require 'globalize/backend/static' -require 'globalize/locale/fallbacks' -require 'globalize/translation' require 'globalize/backend/db/db_translation' module Globalize module Backend - class Db < Static + class Db < I18n::Backend::Simple def init_translations - @translations = Hash.new - Globalize::Db::TranslationLocale.all.each do |locale| - @translations[locale.language_tag.to_sym] = locale.translation_hash - I18n.fallbacks.map locale.language_tag.to_sym => locale.parent.language_tag.to_sym unless locale.parent.nil? - end + @translations ||= Hash.new + @translation_timestamps ||= Hash.new @initialized = true end + + def translate(locale, key, options = {}) + begin + super(locale.to_sym, key, options) + rescue I18n::MissingTranslationData => e + if locale.parent + translate(locale.parent, key, options) + else + raise e + end + end + end + + def translate_with_caching(locale, key, options = {}) + if locale.is_a?(Globalize::Db::TranslationLocale) + init_translations unless initialized? + if @translation_timestamps[locale.id] != locale.updated_at + reload_translation(locale) + end + translate_without_caching(locale, key, options) + else + raise(I18n::MissingTranslationData.new(locale, key, options)) + end + end + alias_method_chain :translate, :caching + + private + + def reload_translation(locale) + begin + Rails.logger.info("Reloading translation #{locale.language_tag}") + rescue NameError + end + + @translations[locale.language_tag.to_sym] = locale.translation_hash(true) + @translation_timestamps[locale.id] = locale.updated_at + end end end end \ No newline at end of file lib/globalize/backend/db.rb @@ -12,7 +12,7 @@ module Globalize record.locale.updated_at_will_change! record.locale.save(false) end - + private def must_have_a_value @@ -22,22 +22,23 @@ module Globalize class TranslationLocale < ActiveRecord::Base belongs_to :parent, :class_name => 'Globalize::Db::TranslationLocale', :foreign_key => 'parent_id' - has_many :children, :class_name => 'Db::TranslationLocale', :foreign_key => 'parent_id', :dependent => :nullify + has_many :children, :class_name => 'Globalize::Db::TranslationLocale', :foreign_key => 'parent_id', :dependent => :nullify belongs_to :creator, :class_name => "User", :foreign_key => "user_id" has_many :translations, :class_name => "Globalize::Db::Translation", :foreign_key => "locale_id", :dependent => :destroy validates_presence_of :locale + validates_presence_of :name validates_uniqueness_of :name before_create :copy_translations_from_parent - def translation_hash - return @hash unless @hash.nil? + def translation_hash(reload = false) + return @hash unless (reload || @hash.nil?) @hash = Hash.new - translations.each do |translation| + translations(reload).each do |translation| branch = translation.key.split('.') leaf = branch.pop @@ -53,6 +54,11 @@ module Globalize def language_tag new_record? ? locale : "#{locale}-x-#{id}" end + alias_method :to_s, :language_tag + + def to_sym + language_tag.to_sym + end def copy_translations_from(other_locale) other_locale.translations.each do |other_translation| lib/globalize/backend/db/db_translation.rb @@ -1,6 +1,6 @@ namespace :i18n do namespace :db do - desc "Load translation yaml file into database" + desc "Load translation yaml file into database: rake i18n:db:load locale=da-x-2" task :load => :environment do file = File.open(File.expand_path("config/locales/#{ENV['locale']}.yml", Rails.root)) data = YAML::load(file) tasks/i18n_db.rake @@ -86,6 +86,18 @@ class TranslateChainedTest < ActiveSupport::TestCase end test "looks up a namespace from all backends and merges them (if a result is a hash and no count option is present)" do + assert_raise( I18n::MissingTranslationData ) { I18n.translate :foo, :raise => true } + + @first_backend.store_translations :en, {:foo => {:bar => 'bar from first backend'}} + result = I18n.translate :foo + assert_equal( {:bar => 'bar from first backend'}, result ) + + I18n.reload! + @last_backend.store_translations :en, {:foo => {:baz => 'baz from last backend'}} + result = I18n.translate :foo + assert_equal( {:baz => 'baz from last backend'}, result ) + + I18n.reload! @first_backend.store_translations :en, {:foo => {:bar => 'bar from first backend'}} @last_backend.store_translations :en, {:foo => {:baz => 'baz from last backend'}} result = I18n.translate :foo test/backends/chained_test.rb @@ -28,20 +28,20 @@ class DbTest < ActiveSupport::TestCase @da_DK_locale.save I18n.backend = Globalize::Backend::Db.new - I18n.locale = @en_US_locale.language_tag + I18n.locale = @en_US_locale end - test "returns an instance of Translation:Static" do + test "returns an instance of String" do translation = I18n.translate :foo - assert_instance_of Globalize::Translation::Static, translation + assert_instance_of String, translation end test "returns the translation in en-US if present" do - assert_equal "foo in en-US", I18n.translate(:foo, :locale => @en_US_locale.language_tag) + assert_equal "foo in en-US", I18n.translate(:foo, :locale => @en_US_locale) end test "returns the translation in parent if not present" do - assert_equal "foo in en-US", I18n.translate(:foo, :locale => @da_DK_locale.language_tag) + assert_equal "foo in en-US", I18n.translate(:foo, :locale => @da_DK_locale) end test "copies translation from parent when created" do @@ -51,13 +51,13 @@ class DbTest < ActiveSupport::TestCase test "reloads translations when asked to" do de_locale = Globalize::Db::TranslationLocale.create(:name => 'German', :locale => 'de', :parent_id => @en_US_locale.id) - assert_equal "foo in en-US", I18n.translate(:foo, :locale => de_locale.language_tag) + I18n.locale = de_locale + assert_equal "foo in en-US", I18n.translate(:foo) translation = de_locale.translations.find_by_key('foo') translation.value = 'foo in de' translation.save - assert_equal "foo in en-US", I18n.translate(:foo, :locale => de_locale.language_tag) - I18n.reload! - assert_equal "foo in de", I18n.translate(:foo, :locale => de_locale.language_tag) + I18n.locale.reload + assert_equal "foo in de", I18n.translate(:foo) end end \ No newline at end of file test/backends/db_test.rb ba479302fc415278147a5a5a6a3f00a78fcefc8a Mick Staugaard spam@staugaard.com http://github.com/staugaard/globalize2/commit/77b679061dce1b00492631549659fcd42fc6bb7c 77b679061dce1b00492631549659fcd42fc6bb7c 2009-02-18T03:08:25-08:00 2009-01-28T07:38:29-08:00 fixing chain and adding tests for fixes added caching to the db backend a9af544fc1f27bf7c7a72a95c0fc917d12f9d16a Mick Staugaard spam@staugaard.com