Update record checkers before save

galetahub · Jul 22, 2011 · 061c2ae · 061c2ae
1 parent 382829c
commit 061c2ae
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/lib/globalize/active_record/accessors.rb b/lib/globalize/active_record/accessors.rb
@@ -6,12 +6,12 @@ def self.included(base)
           translated_attribute_names.each do |attr_name|  
             Globalize.available_locales.each do |locale|
               define_method :"#{attr_name}_#{locale}" do
-                read_attribute(attr_name, locale)
+                read_attribute(attr_name, {:locale => locale})
               end
 
               define_method :"#{attr_name}_#{locale}=" do |value|
                 changed_attributes[:"#{attr_name}_#{locale}"] = value unless value == read_attribute(attr_name, locale)
-                write_attribute(attr_name, value, locale)
+                write_attribute(attr_name, value, {:locale => locale})
               end
             end
           end 

diff --git a/lib/globalize/active_record/act_macro.rb b/lib/globalize/active_record/act_macro.rb
@@ -32,6 +32,7 @@ def translates(*attr_columns)
                                 :dependent   => :destroy,
                                 :extend      => HasManyExtensions
 
+        before_save :update_checkers!
         after_create :save_translations!
         after_update :save_translations!
 

diff --git a/lib/globalize/active_record/adapter.rb b/lib/globalize/active_record/adapter.rb
@@ -48,6 +48,10 @@ def save_translations!
       def reset
         stash.clear
       end
+
+      def all_blank?(locale, attrs)
+        [attrs].flatten.collect { |name| fetch_stash(locale, name).blank? }.all?
+      end
 
     protected
 

diff --git a/lib/globalize/active_record/instance_methods.rb b/lib/globalize/active_record/instance_methods.rb
@@ -141,7 +141,13 @@ def used_locales
         locales.uniq!
         locales
       end
-
+
+      def update_checkers!
+        Globalize.available_locales.each do |locale|
+          self["is_locale_#{locale}"] = !globalize.all_blank?(locale, translated_attribute_names)
+        end
+      end
+
       def save_translations!
         globalize.save_translations!
         @translation_caches = {}

diff --git a/lib/globalize/active_record/translation.rb b/lib/globalize/active_record/translation.rb
@@ -1,6 +1,8 @@
 module Globalize
   module ActiveRecord
     class Translation < ::ActiveRecord::Base
+      attr_accessible :locale
+
       class << self
         def with_locales(*locales)
           # Avoid using "IN" with SQL queries when only using one locale.