chipairon-i18n-active_record 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a21451f4f0606b0ece514ef310c4b6b1f173f15d
-  data.tar.gz: 0db34961a29760d60c8c440e4792b3eed056d1d9
+  metadata.gz: 798056b0e6fbacf7b98182202e34af8e23e16585
+  data.tar.gz: cc430df424903e741138ef98d78c95224738a4cc
 SHA512:
-  metadata.gz: 4b17dbb4cbacaa33ad46af65a66bc0a4ef1b0c1f6e9f67d0044f7549d9a39ddc4b0c402de96b6c2f54b2a482f6b3065cc20cf7d0888b26a663a4bc8b05234f14
-  data.tar.gz: aa4e52a831e4f7ccd2a38f18d71e16ffb37fa49f1cfdd4c795b4258c671ee794c933009c68878810e14898f888ab34c0244f71d0b8cacc2de46b7845c7c06ef9
+  metadata.gz: 5f8daec77a6c348cd500bd0dd63c5df0b9a36f079fd753bae1ba6e3f41a6eff07765432a9c3c16199316b697e79a4e34f951124acf7bdd64b2f154c17b70fa29
+  data.tar.gz: deb3bcf0c44a4d7bfc479d11537eb3417a3b34424131addafed1d6c98e3dfe0fe789b3e28ca1f8d78a11626b6d6784413974aa779cc6d5808ceb4676799091cd

data/lib/i18n/active_record/version.rb

@@ -1,6 +1,6 @@
 module I18n
   module ActiveRecord
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end
 

data/lib/i18n/backend/active_record/missing.rb

@@ -41,23 +41,23 @@ module I18n
           key = normalize_flat_keys(locale, key, scope, separator)
           interpolations = options.keys - I18n::RESERVED_KEYS
 
-          # if already memoized, then a record already exists.
-          if @memoized_lookup and @memoized_lookup[locale.to_sym].keys.include? key.to_sym
-            return
-          end
-
-          if I18n::available_locales.any?
-            I18n::available_locales.each do |a_locale|
-              store_if_not_exists(a_locale, key, interpolations, count)
+          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
+            if I18n::available_locales.any?
+              I18n::available_locales.each do |a_locale|
+                store_if_not_exists(a_locale, key, interpolations, count)
+              end
+            else
+              store_if_not_exists(locale, key, interpolations, count)
             end
-          else
-            store_if_not_exists(locale, key, interpolations, count)
+            # if memoization is included, this refreshes the hash to get new values just stored                                                                                                                     
+            try(:reload!)
           end
         end
 
         def store_default_translation(locale, key, interpolations)
           translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
           translation.interpolations = interpolations
+          translation.value = get_value_from_simple_backend(locale, key)
           translation.save
         end
 
@@ -85,6 +85,18 @@ module I18n
             end
             plurals
           end
+
+        private
+          # Check if this backend is chainning with simple
+          # then try to get value from its hash.
+          def get_value_from_simple_backend(locale, key)
+            if I18n.backend.class == Chain &&
+              I18n.backend.backends.last.class == Simple
+              I18n.backend.backends.last.send(:lookup, locale, key)
+            else
+              nil
+            end
+          end
       end
     end
   end

data/lib/i18n/backend/active_record/missing.rb.orig

@@ -41,6 +41,7 @@ module I18n
           key = normalize_flat_keys(locale, key, scope, separator)
           interpolations = options.keys - I18n::RESERVED_KEYS
 
+<<<<<<< HEAD
           # if already memoized, then a record already exists.
           if @memoized_lookup and @memoized_lookup[locale.to_sym].keys.include? key.to_sym
             return
@@ -52,24 +53,22 @@ module I18n
             end
           else
             store_if_not_exists(locale, key, interpolations, count)
-          end
-        end
-
-        def store_if_not_exists(locale, key, interpolations, count)
-          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
-<<<<<<< HEAD
-            keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
 =======
+          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
             interpolations = options.keys - I18n::RESERVED_KEYS
-            keys = count ? get_plurals(locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
->>>>>>> e4d6427a8d4550e773199bef8410dcbe5f175f62
+            keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
             keys.each { |key| store_default_translation(locale, key, interpolations) }
+
+            # if memoization is included, this refreshes the hash to get new values just stored
+            try(:reload!)
+>>>>>>> 5dfbeffc11eed8fb7cf0313fa6288d34417bf38d
           end
         end
 
         def store_default_translation(locale, key, interpolations)
           translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
           translation.interpolations = interpolations
+          translation.value = get_value_from_simple_backend(locale, key)
           translation.save
         end
 
@@ -80,6 +79,15 @@ module I18n
         end
 
         private
+<<<<<<< HEAD
+
+          def store_if_not_exists(locale, key, interpolations, count)
+            unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
+              keys = count ? get_plurals(locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
+              keys.each { |key| store_default_translation(locale, key, interpolations) }
+            end
+          end
+
           # get plural rules or use English rules as default:
           def get_plurals(locale)
             plurals = I18n.t('i18n.plural.keys', :locale => locale)
@@ -88,6 +96,17 @@ module I18n
               plurals = [:zero, :one, :other]
             end
             plurals
+=======
+          # Check if this backend is chainning with simple
+          # then try to get value from its hash.
+          def get_value_from_simple_backend(locale, key)
+            if I18n.backend.class == Chain &&
+              I18n.backend.backends.last.class == Simple
+              I18n.backend.backends.last.send(:lookup, locale, key)
+            else
+              nil
+            end
+>>>>>>> 5dfbeffc11eed8fb7cf0313fa6288d34417bf38d
           end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chipairon-i18n-active_record
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n