@@ -2,8 +2,12 @@ class DbTranslationLocale < ActiveRecord::Base set_table_name "translation_locales" acts_as_tree belongs_to :creator, :class_name => "User", :foreign_key => "user_id" - has_many :translations, :class_name => "DbTranslation", :foreign_key => "locale_id" - validates_uniqueness_of :locale + has_many :translations, :class_name => "DbTranslation", :foreign_key => "locale_id", :dependent => :destroy + + validates_presence_of :locale + validates_uniqueness_of :name + + before_create :copy_translations_from_parent def translation_hash return @hash unless @hash.nil? @@ -24,6 +28,45 @@ class DbTranslationLocale < ActiveRecord::Base end def language_tag - "#{locale}-x-#{id}" + new_record? ? locale : "#{locale}-x-#{id}" + end + + def copy_translations_from(other_locale) + other_locale.translations.each do |other_translation| + translations << other_translation.clone + end + end + + def self.from_yaml_file(file, locale) + data = YAML::load(file) + + translation_locale = DbTranslationLocale.new(:locale => locale) + add_translations_from_yaml(translation_locale, data[locale]) + translation_locale + end + + def missing_keys(all_keys) + all_keys - translations.map {|t| t.key} + end + + def complete?(all_keys) + missing_keys(all_keys).empty? + end + + protected + + def copy_translations_from_parent + copy_translations_from(parent) if parent + end + + def self.add_translations_from_yaml(locale, data, prefix = nil) + data.each do |key, value| + full_key = prefix.nil? ? key : "#{prefix}.#{key}" + if value.is_a?(Hash) + add_translations_from_yaml(locale, value, full_key) + else + locale.translations.build(:key => full_key, :value => value) + end + end end end lib/globalize/backend/db/db_translation_locale.rb @@ -46,6 +46,8 @@ module Globalize result.map do |value| translation(value, meta) end + when Symbol + result else raise "unexpected translation type: #{result.inspect}" end lib/globalize/backend/static.rb e518e7916bf362810958f8f7b4f74688edee2d82 Mick Staugaard spam@staugaard.com http://github.com/hchoroomi/globalize2/commit/b6a2a0d0b4653f33d1d6f62e019015976da75cf3 b6a2a0d0b4653f33d1d6f62e019015976da75cf3 2009-01-05T04:27:53-08:00 2009-01-05T04:27:53-08:00 when creating a new locale with a parent, the parent translations are now copied to the new locale 77f1f8b9990448afb76f0e3802f68ee30c25b39b Mick Staugaard spam@staugaard.com