air18n 0.4.2 → 0.4.3

data/lib/air18n/backend.rb

@@ -234,8 +234,9 @@ module Air18n
           end
         end
         if store_default
-          phrase = Phrase.find_or_create_by_key(key)
-          if phrase
+          phrase = Phrase.where(:key => key).first
+          if phrase.present?
+            # A phrase with this key already exists; change its default text.
             if (overrides_previous_default && phrase.value != default) ||
               (!overrides_previous_default && phrase.value != default && phrase.value.blank?)
               phrase.value = default
@@ -249,6 +250,9 @@ module Air18n
                 # again to create it next time automatically.
               end
             end
+          else
+            # Create the phrase for the first time.
+            Phrase.create(:key => key, :value => default)
           end
 
           @translation_data[locale][key] = default

data/lib/air18n/phrase.rb

@@ -59,14 +59,12 @@ module Air18n
             -pt.locale.to_s.size
           end
           translations_with_language_last.each do |pt|
-            PhraseTranslation.create_translation(
-              self.id,
-              self.key,
-              pt.locale,
-              pt.value,
-              0,  # user ID: 0 means automated
-              false,  # do xss check? no
-              false  # allow verification? no
+            PhraseTranslation.create(
+              :user_id => 0,  # 0 means Automated
+              :phrase => self,
+              :key => self.key,
+              :locale => pt.locale,
+              :value => pt.value
             )
           end
         end

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/lib/air18n/phrase_spec.rb

@@ -52,6 +52,8 @@ describe Air18n::Phrase do
 
       # Should have three translations auto-populated.
       @phrase2.phrase_translations.size.should == 3
+      @phrase2.phrase_translations.first.phrase_id.should == @phrase2.id
+      @phrase2.phrase_translations.first.user_id.should == 0
 
       @phrase2.latest_translation(:"zh-TW").id.should < @phrase2.latest_translation(:zh).id
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n