air18n 0.4.12 → 0.4.13

data/lib/air18n/backend.rb

@@ -30,7 +30,10 @@ module Air18n
     def store_translations locale, data, options = {}
       @translation_data ||= {}
       @translation_data[locale.to_sym] = data
-      ChunkCache::set(I18n.cache, T_DATA % locale, data, 1.day) if I18n.cache
+      # We pass in nil for the expiry because we do not want the translations to
+      # be expired. Rather we prefer to explicitily overwrite them when reload
+      # translations is called.
+      ChunkCache::set(I18n.cache, T_DATA % locale, data, nil) if I18n.cache
     end
 
     def available_locales
@@ -128,8 +131,6 @@ module Air18n
         if (translation_last_loaded_at.nil?) || (last_updated_at && last_updated_at.to_i >= translation_last_loaded_at.to_i)
           I18n.cache.write(T_LAST_LOADED_AT % locale, Time.now + RACE_CONDITION_TTL) if I18n.cache
           reload_translations([locale])
-        else
-          get_from_cache_or_reload(locale)
         end
       end
     end

data/lib/air18n/phrase.rb

@@ -39,7 +39,12 @@ module Air18n
       existing_phrase = Phrase.
           where(:value => self.value).
           where('`phrases`.id < ?', self.id).
-          last
+          order('id DESC').
+          all.
+          find { |p| p.value == self.value }  # Make sure we don't copy from a phrase with different
+                                              # capitalization (that matched query because of DB
+                                              # collation)
+
       if existing_phrase.present?
         translations = PhraseTranslation.
             where(:phrase_id => existing_phrase.id).

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/lib/air18n/phrase_spec.rb

@@ -56,6 +56,9 @@ describe Air18n::Phrase do
       @phrase2.phrase_translations.first.user_id.should == 0
 
       @phrase2.latest_translation(:"zh-TW").id.should < @phrase2.latest_translation(:zh).id
+
+      @phrase3 = FactoryGirl.create(:phrase, :key => 'copying, key 3', :value => 'Copying, Value 1')
+      @phrase3.phrase_translations.size.should == 0
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dynamic I18n backend