Extend to other serializers

Author: nattsw

plugin.rb

@@ -55,7 +55,8 @@ module ::DiscourseTranslator
 
   register_modifier(:topic_serializer_fancy_title) do |fancy_title, serializer|
     if !SiteSetting.experimental_topic_translation ||
-         serializer.scope.request.params["show"] == "original"
+         serializer.scope.request.params["show"] == "original" ||
+         serializer.object.detected_locale == I18n.locale.to_s.gsub("_", "-")
       fancy_title
     else
       translation = serializer.object.translation_for(I18n.locale)
@@ -65,7 +66,8 @@ module ::DiscourseTranslator
 
   register_modifier(:topic_view_serializer_fancy_title) do |fancy_title, serializer|
     if !SiteSetting.experimental_topic_translation ||
-         serializer.scope.request.params["show"] == "original"
+         serializer.scope.request.params["show"] == "original" ||
+         serializer.object.topic.detected_locale == I18n.locale.to_s.gsub("_", "-")
       fancy_title
     else
       translation = serializer.object.topic.translation_for(I18n.locale)

spec/serializers/basic_topic_serializer_spec.rb

@@ -45,6 +45,14 @@ def serialize_topic(guardian_user: user, params: {})
       expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
     end
 
+    it "does not replace fancy_title when topic is already in correct locale" do
+      I18n.locale = "ja"
+      topic.set_detected_locale("ja")
+      topic.set_translation("ja", jap_title)
+
+      expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
+    end
+
     it "returns translated title in fancy_title when translation exists for current locale" do
       topic.set_translation("ja", jap_title)
       expect(serialize_topic.fancy_title).to eq(jap_title)

spec/serializers/topic_view_serializer_spec.rb

@@ -68,6 +68,14 @@ def serialize_topic(guardian_user: user, params: {})
       expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
     end
 
+    it "does not replace fancy_title when topic is already in correct locale" do
+      I18n.locale = "ja"
+      topic.set_detected_locale("ja")
+      topic.set_translation("ja", jap_title)
+
+      expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
+    end
+
     it "returns translated title in fancy_title when translation exists for current locale" do
       topic.set_translation("ja", jap_title)
       expect(serialize_topic.fancy_title).to eq(jap_title)