air18n 0.1.34 → 0.1.35

data/lib/air18n/phrase_translation.rb

@@ -108,6 +108,11 @@ module Air18n
           else
             message = error
           end
+        elsif latest && latest.user_id != user_id
+          pt.is_verification = true
+
+          do_save = true
+          message = "Translation saved, marked as verified."
         else
           do_save = true
           message = "Translation saved."

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.34"
+  VERSION = "0.1.35"
 end

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -163,46 +163,68 @@ describe Air18n::PhraseTranslation do
         translation.source_word_count.should == 3
         translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
 
+        # Since November 2012, we automatically mark edits as verifications.
+        # But not when the translator is the same as the one before.
+        translation.should_not be_verification
+
+        ##### 3.5. Submission of unchanged translation by same translator.
+
+        response = Air18n::PhraseTranslation.create_translation(
+          phrase.id, phrase.key, :es, 'whyo helloo newword1 thereo newword2', user_id_first, do_xss_check, allow_verification)
+        response.should include(
+          :status => 'error', :message => 'You last translated this phrase, so somebody else must verify it.')
+
+        unchanged_translation = phrase.latest_translation(:es)
+        unchanged_translation.id.should == translation.id
+
         ##### 3. Tweak to existing translation to delete a word.
 
         response = Air18n::PhraseTranslation.create_translation(
-          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_first, do_xss_check, allow_verification)
+          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_second, do_xss_check, allow_verification)
 
         translation = phrase.latest_translation(:es)
         translation.value.should == 'whyo helloo newword1 newword2'
         translation.source_word_count.should == 3
         translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
 
-        ##### 4. Submission of unchanged translation.
+        # Since November 2012, we automatically mark edits as verifications.
+        # This one is done by a different translator as the previous
+        # translator, so is a verification.
+        translation.should be_verification
+
+        ##### 4. Submission of unchanged translation for a phrase that is
+        #####    already verified.
 
         response = Air18n::PhraseTranslation.create_translation(
           phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_first, do_xss_check, allow_verification)
         response.should include(
-          :status => 'error', :message => 'You last translated this phrase, so somebody else must verify it.')
+          :status => 'error', :message => 'Translation already verified; nothing saved.')
 
         unchanged_translation = phrase.latest_translation(:es)
         unchanged_translation.id.should == translation.id
 
-        ##### 5. Submission of unchanged translation for stale phrase.
+        ##### 5. Submission of unchanged translation for stale phrase by same translator.
 
         phrase.value = 'why hello there, good day'
         phrase.save!
 
         response = Air18n::PhraseTranslation.create_translation(
-          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_first, do_xss_check, allow_verification)
+          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_second, do_xss_check, allow_verification)
         response.should include(
           :status => 'success', :message => 'Translation marked as up-to-date.')
 
         translation = phrase.latest_translation(:es)
         translation.value.should == 'whyo helloo newword1 newword2'
         translation.source_word_count.should == 3
-        translation.is_verification.should == false  # Not actually a verification.
+        translation.is_verification.should == true  # Because last touch was verification.
         translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
 
-        ##### 6. Verification by a different translator.
+        ##### 6. Submission of unchanged translation for stale phrase by different translator.
+        phrase.value = 'why hello there, happy day'
+        phrase.save!
 
         response = Air18n::PhraseTranslation.create_translation(
-          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_second, do_xss_check, allow_verification)
+          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_first, do_xss_check, allow_verification)
         response.should include(
           :status => 'success', :message => 'Translation verified.')
 
@@ -210,7 +232,7 @@ describe Air18n::PhraseTranslation do
         translation.value.should == 'whyo helloo newword1 newword2'
         translation.source_word_count.should == 5
         translation.is_verification.should == true
-        translation.source_hash.should == "6f20684ed3e1fa2c9ccd30249d5c9f7a"
+        translation.source_hash.should == "9fd16f4422eadae1c159d60ba063405f"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.35
   prerelease: 
 platform: ruby
 authors: