Updates

Author: nattsw

app/jobs/scheduled/automatic_translation_backfill.rb

@@ -93,7 +93,7 @@ def process_batch
       models_translated = [Post, Topic].size
       translations_per_model = [translations_per_run / models_translated, 1].max
       topic_ids = fetch_untranslated_model_ids(Topic, translations_per_model)
-      translations_per_model = translations_per_run if topic_ids.empty?
+      translations_per_model = translations_per_run - topic_ids.size
       post_ids = fetch_untranslated_model_ids(Post, translations_per_model)
       return if topic_ids.empty? && post_ids.empty?
 

plugin.rb

@@ -40,19 +40,19 @@ module ::DiscourseTranslator
 
   on(:post_process_cooked) do |_, post|
     if SiteSetting.automatic_translation_target_languages.present?
-      Jobs.enqueue(:translate_translatable, type: Post, translatable_id: post.id)
+      Jobs.enqueue(:translate_translatable, type: "Post", translatable_id: post.id)
     end
   end
 
   on(:topic_created) do |topic|
     if SiteSetting.automatic_translation_target_languages.present?
-      Jobs.enqueue(:translate_translatable, type: Topic, translatable_id: topic.id)
+      Jobs.enqueue(:translate_translatable, type: "Topic", translatable_id: topic.id)
     end
   end
 
   on(:topic_edited) do |topic|
     if SiteSetting.automatic_translation_target_languages.present?
-      Jobs.enqueue(:translate_translatable, type: Topic, translatable_id: topic.id)
+      Jobs.enqueue(:translate_translatable, type: "Topic", translatable_id: topic.id)
     end
   end
 

spec/jobs/automatic_translation_backfill_spec.rb

@@ -74,7 +74,7 @@ def expect_google_translate(text)
     describe "with two locales ['de', 'es']" do
       before do
         SiteSetting.automatic_translation_target_languages = "de|es"
-        SiteSetting.automatic_translation_backfill_maximum_translations_per_hour = 10
+        SiteSetting.automatic_translation_backfill_maximum_translations_per_hour = 100
         expect_google_check_language
       end
 
@@ -104,6 +104,31 @@ def expect_google_translate(text)
         expect(post.translations.pluck(:locale, :translation)).to eq([%w[de hallo]])
       end
     end
+
+    describe "with just one locale ['de']" do
+      before do
+        SiteSetting.automatic_translation_target_languages = "de"
+        SiteSetting.automatic_translation_backfill_maximum_translations_per_hour = 5 * 12
+        expect_google_check_language
+      end
+
+      it "backfills all (1) topics and (4) posts as it is within the maximum per job run" do
+        topic = Fabricate(:topic)
+        posts = Fabricate.times(4, :post, topic: topic)
+
+        topic.set_detected_locale("es")
+        posts.each { |p| p.set_detected_locale("es") }
+
+        expect_google_translate("hallo").times(5)
+
+        described_class.new.execute
+
+        expect(topic.translations.pluck(:locale, :translation)).to eq([%w[de hallo]])
+        expect(posts.map { |p| p.translations.pluck(:locale, :translation).flatten }).to eq(
+          [%w[de hallo]] * 4,
+        )
+      end
+    end
   end
 
   describe ".fetch_untranslated_model_ids" do

spec/jobs/detect_posts_language_spec.rb

@@ -42,12 +42,17 @@
   end
 
   it "processes a maximum of MAX_QUEUE_SIZE posts per run" do
-    large_number = 2000
-    large_number.times { |i| Discourse.redis.sadd?(redis_key, i + 1) }
+    queue_size = 4
+    described_class.const_set(:MAX_QUEUE_SIZE, queue_size)
+
+    existing_posts = Discourse.redis.scard(redis_key)
+    posts = 5
+    posts.times { |i| Discourse.redis.sadd?(redis_key, i + 1) }
+
     described_class.new.execute({})
 
     remaining = Discourse.redis.scard(redis_key)
-    expect(remaining).to eq(large_number - Jobs::DetectPostsLanguage::MAX_QUEUE_SIZE)
+    expect(remaining).to eq((existing_posts + posts) - queue_size)
   end
 
   it "handles an empty Redis queue gracefully" do