tests

Author: nattsw

app/models/discourse_translator/post_translation.rb

@@ -10,10 +10,6 @@ class PostTranslation < ActiveRecord::Base
     validates :locale, presence: true
     validates :translation, presence: true
     validates :locale, uniqueness: { scope: :post_id }
-
-    def self.translation_for(post_id, locale)
-      find_by(post_id: post_id, locale: locale)&.translation
-    end
   end
 end
 

app/models/discourse_translator/topic_translation.rb

@@ -10,10 +10,6 @@ class TopicTranslation < ActiveRecord::Base
     validates :locale, presence: true
     validates :translation, presence: true
     validates :locale, uniqueness: { scope: :topic_id }
-
-    def self.translation_for(topic_id, locale)
-      find_by(topic_id: topic_id, locale: locale)&.translation
-    end
   end
 end
 

lib/discourse_translator/inline_translation.rb

@@ -42,13 +42,23 @@ def inject(plugin)
         :basic_post,
         :is_translated,
         include_condition: -> { SiteSetting.experimental_inline_translation },
-      ) { object.translation_for(I18n.locale).present? }
+      ) { !object.locale_matches?(I18n.locale) && object.translation_for(I18n.locale).present? }
 
       plugin.add_to_serializer(
         :topic_view,
         :is_translated,
         include_condition: -> { SiteSetting.experimental_inline_translation },
-      ) { object.topic.translations.present? || object.posts.any? { |p| p.translations.present? } }
+      ) do
+        # since locales are eager loaded, but translations may not
+        # return early if topic and posts are all in the user's locale
+        if object.topic.locale_matches?(I18n.locale) &&
+             object.posts.all? { |p| p.locale_matches?(I18n.locale) }
+          return false
+        end
+
+        object.topic.translation_for(I18n.locale).present? ||
+          object.posts.any? { |p| p.translation_for(I18n.locale).present? }
+      end
     end
   end
 end

lib/discourse_translator/topic_view_serializer_extension.rb

@@ -5,8 +5,18 @@ module TopicViewSerializerExtension
     def posts
       if SiteSetting.translator_enabled?
         posts_query = object.posts.includes(:content_locale)
+        # this is kind of a micro-optimization.
+        # we do not want to eager load translations if the user is using the site's language.
+        # we will only load them if the user is using a different language that is supported by the site.
         posts_query =
-          posts_query.includes(:translations) if SiteSetting.experimental_inline_translation
+          posts_query.includes(:translations) if SiteSetting.experimental_inline_translation &&
+          (
+            I18n.locale.to_s != SiteSetting.default_locale &&
+              SiteSetting
+                .automatic_translation_target_languages
+                .split("|")
+                .include?(I18n.locale.to_s)
+          )
         object.instance_variable_set(:@posts, posts_query)
       end
       super

spec/serializers/post_serializer_spec.rb

@@ -78,6 +78,7 @@
       SiteSetting.translator_enabled = true
       SiteSetting.experimental_inline_translation = true
       I18n.locale = "ja"
+      post.set_detected_locale("en")
       post.set_translation("ja", "こんにちは")
       serializer = PostSerializer.new(post, scope: Guardian.new)
 

spec/serializers/topic_view_serializer_spec.rb

@@ -45,27 +45,77 @@
       expect(topic_view.posts.first.association(:content_locale)).to be_loaded
     end
 
-    it "preloads translations when experimental_inline_translation is enabled" do
-      SiteSetting.experimental_inline_translation = true
-
-      en_post.set_translation("es", "Hola")
-      es_post.set_translation("en", "Hello")
-
-      topic_view = TopicView.new(topic)
-      serializer = TopicViewSerializer.new(topic_view, scope: Guardian.new(user), root: false)
-
-      topic_view.posts.reload
-
-      queries =
-        track_sql_queries do
-          json = serializer.as_json
-          json[:post_stream][:posts].each { |p| p[:translations] }
-        end
-
-      translation_queries =
-        queries.count { |q| q.include?("discourse_translator_post_translations") }
-      expect(translation_queries).to eq(1)
-      expect(topic_view.posts.first.association(:translations)).to be_loaded
+    describe "preloading translations with SiteSetting.experimental_inline_translations" do
+      before do
+        SiteSetting.experimental_inline_translation = true
+
+        en_post.set_translation("es", "Hola")
+        es_post.set_translation("en", "Hello")
+      end
+
+      it "does not preload translations when user locale matches site default locale" do
+        SiteSetting.default_locale = "en"
+        I18n.locale = "en"
+
+        topic_view = TopicView.new(topic)
+        serializer = TopicViewSerializer.new(topic_view, scope: Guardian.new(user), root: false)
+
+        topic_view.posts.reload
+
+        queries =
+          track_sql_queries do
+            json = serializer.as_json
+            json[:post_stream][:posts].each { |p| p[:translations] }
+          end
+
+        expect(queries.count { |q| q.include?("discourse_translator_post_translations") }).to eq(3)
+      end
+
+      it "does not preload translations when locales are different and not in automatic_translation_target_languages" do
+        SiteSetting.default_locale = "en"
+        I18n.locale = "ja"
+        SiteSetting.automatic_translation_backfill_maximum_translations_per_hour = 1
+        SiteSetting.automatic_translation_target_languages = "es"
+
+        topic_view = TopicView.new(topic)
+        serializer = TopicViewSerializer.new(topic_view, scope: Guardian.new(user), root: false)
+
+        topic_view.posts.reload
+
+        queries =
+          track_sql_queries do
+            json = serializer.as_json
+            json[:post_stream][:posts].each { |p| p[:translations] }
+          end
+
+        translation_queries =
+          queries.count { |q| q.include?("discourse_translator_post_translations") }
+        expect(translation_queries).to eq(3)
+        expect(topic_view.posts.first.association(:translations)).to be_loaded
+      end
+
+      it "preloads translations when locales are different and in automatic_translation_target_languages" do
+        SiteSetting.default_locale = "en"
+        I18n.locale = "es"
+        SiteSetting.automatic_translation_backfill_maximum_translations_per_hour = 1
+        SiteSetting.automatic_translation_target_languages = "es"
+
+        topic_view = TopicView.new(topic)
+        serializer = TopicViewSerializer.new(topic_view, scope: Guardian.new(user), root: false)
+
+        topic_view.posts.reload
+
+        queries =
+          track_sql_queries do
+            json = serializer.as_json
+            json[:post_stream][:posts].each { |p| p[:translations] }
+          end
+
+        translation_queries =
+          queries.count { |q| q.include?("discourse_translator_post_translations") }
+        expect(translation_queries).to eq(1)
+        expect(topic_view.posts.first.association(:translations)).to be_loaded
+      end
     end
   end