air18n 0.1.39 → 0.1.40

data/lib/air18n/phrase_translation.rb

@@ -108,7 +108,9 @@ module Air18n
           else
             message = error
           end
-        elsif latest && latest.user_id != user_id
+        elsif latest && (latest.user_id != user_id || latest.is_verification)
+          # If the translator is different than the last, or the last
+          # translation was already a verification, this one is too.
           pt.is_verification = true
 
           do_save = true

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.39"
+  VERSION = "0.1.40"
 end

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -177,7 +177,8 @@ describe Air18n::PhraseTranslation do
         unchanged_translation = phrase.latest_translation(:es)
         unchanged_translation.id.should == translation.id
 
-        ##### 3. Tweak to existing translation to delete a word.
+        ##### 3. Tweak to existing translation to delete a word by a different
+        #####    translator.
 
         response = Air18n::PhraseTranslation.create_translation(
           phrase.id, phrase.key, :es, 'whyo helloo newword1 newword2', user_id_second, do_xss_check, allow_verification)
@@ -187,6 +188,16 @@ describe Air18n::PhraseTranslation do
         translation.source_word_count.should == 3
         translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
 
+        ##### 3. Tweak to verified translation by same translator.
+
+        response = Air18n::PhraseTranslation.create_translation(
+          phrase.id, phrase.key, :es, 'whyo helloo newword1 newword3', user_id_second, do_xss_check, allow_verification)
+
+        translation = phrase.latest_translation(:es)
+        translation.value.should == 'whyo helloo newword1 newword3'
+        translation.source_word_count.should == 3
+        translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
+
         # 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.
@@ -196,7 +207,7 @@ describe Air18n::PhraseTranslation do
         #####    already verified.
 
         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 newword3', user_id_first, do_xss_check, allow_verification)
         response.should include(
           :status => 'error', :message => 'Translation already verified; nothing saved.')
 
@@ -209,12 +220,12 @@ describe Air18n::PhraseTranslation do
         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 newword3', 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.value.should == 'whyo helloo newword1 newword3'
         translation.source_word_count.should == 3
         translation.is_verification.should == true  # Because last touch was verification.
         translation.source_hash.should == "2ac1a5cdad0d3ca0b0c318000c2f7378"
@@ -224,12 +235,12 @@ describe Air18n::PhraseTranslation do
         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 newword3', user_id_first, do_xss_check, allow_verification)
         response.should include(
           :status => 'success', :message => 'Translation verified.')
 
         translation = phrase.latest_translation(:es)
-        translation.value.should == 'whyo helloo newword1 newword2'
+        translation.value.should == 'whyo helloo newword1 newword3'
         translation.source_word_count.should == 5
         translation.is_verification.should == true
         translation.source_hash.should == "9fd16f4422eadae1c159d60ba063405f"
@@ -618,6 +629,25 @@ describe Air18n::PhraseTranslation do
         words_translated.should == 1 # 3 / 17 * 5 = 0.88, ceils to 1
         words_verified.should == 4
 
+        # Example from Chinese translators wondering if word count computation
+        # is fair.
+        pair = {
+          :translation=>"Airbnb是一個值得信賴的社區市場，在這里人們可以發布、尋找和預訂來自全球各地的獨特住所。",
+          :previous_translation=>"Airbnb的是市場的人列表中，發現一個值得信任的社區，和世界各地的本書獨特的住宿",
+          :was_stale=>false,
+          :locale=>"zh",
+          :user_id=>5,
+          :previous_user_id=>6,
+          :datetime=>Date.new(2012, 11, 04),
+          :source_word_count=>Air18n::PhraseTranslation.segment(
+            "Airbnb is a trusted community marketplace for people to list, " +
+            "discover, and book unique accommodations around the world").size,
+          :phrase_key=>'Airbnb is sick'
+        }
+        words_translated, words_verified = Air18n::PhraseTranslation.word_counts_from_translation_pair(pair)
+        words_translated.should == 11
+        words_verified.should == 7
+
         # Test that Greek works. There was once a bug where word segmentation
         # didn't work for non-Latin alphabets.
         pair = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n