simple_model_translations 0.2.4 → 0.2.5

data/lib/simple_model_translations/translation_helper.rb

@@ -6,7 +6,11 @@ module SimpleModelTranslations
     end
 
     def find_translation_by_locale(locale)
-      translations.detect { |t| t.locale.to_sym == locale }
+      if translations.loaded? || @record.new_record?
+        translations.detect { |t| t.locale.to_sym == locale }
+      else
+        translations.find_by_locale(locale)
+      end
     end
 
     def find_or_build_translation_by_locale(locale)
@@ -26,7 +30,7 @@ module SimpleModelTranslations
     end
 
     def current_translation
-      find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
+      cached_translations[current_locale_for_translation] ||= find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
     end
 
     def find_or_build_current_translation
@@ -38,6 +42,10 @@ module SimpleModelTranslations
         @record.class.name.underscore.to_sym
       end
       
+      def cached_translations
+        @cached_translations ||= {}
+      end
+      
       def translations
         @record.send(@translation_association)
       end

data/lib/simple_model_translations/version.rb

@@ -1,3 +1,3 @@
 module SimpleModelTranslations
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-13 00:00:00 +02:00
+date: 2011-03-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency