Also translate topic titles

Author: nattsw

assets/javascripts/discourse/components/show-original-content.gjs

@@ -1,40 +1,39 @@
-import Component from "@glimmer/component";
-import { service } from "@ember/service";
-import { action } from "@ember/object";
-import DButton from "discourse/components/d-button";
-import concatClass from "discourse/helpers/concat-class";
-import { tracked } from "@glimmer/tracking";
-
-export default class ShowOriginalContent extends Component {
-  @service router;
-  @tracked active = true;
-
-  constructor() {
-    super(...arguments);
-    this.active = !new URLSearchParams(window.location.search).has("show_original");
-  }
-
-  @action
-  async showOriginal() {
-    this.active = !this.active;
-    window.location.search = this.active ? "" : `show_original=1`;
-  }
-
-  get title() {
-    return this.active
-      ? "translator.hide_translation"
-      : "translator.show_translation";
-  }
-
-  <template>
-    <div class="discourse-translator_toggle-original">
-      <DButton
-        @icon="language"
-        @title={{this.title}}
-        class={{concatClass "btn btn-default" (if this.active "active")}}
-        @action={{this.showOriginal}}
-      >
-      </DButton>
-    </div>
-  </template>
-}
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import { action } from "@ember/object";
+import DButton from "discourse/components/d-button";
+import concatClass from "discourse/helpers/concat-class";
+import { tracked } from "@glimmer/tracking";
+
+export default class ShowOriginalContent extends Component {
+  @service router;
+  @tracked active = true;
+
+  constructor() {
+    super(...arguments);
+    this.active = !new URLSearchParams(window.location.search).has("show");
+  }
+
+  @action
+  async showOriginal() {
+    this.active = !this.active;
+    window.location.search = this.active ? "" : `show=original`;
+  }
+
+  get title() {
+    return this.active
+      ? "translator.hide_translation"
+      : "translator.show_translation";
+  }
+
+  <template>
+    <div class="discourse-translator_toggle-original">
+      <DButton
+        @icon="language"
+        @title={{this.title}}
+        class={{concatClass "btn btn-default" (if this.active "active")}}
+        @action={{this.showOriginal}}
+      />
+    </div>
+  </template>
+}

lib/discourse_translator/translator_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DiscourseTranslator
+  module TranslatorHelper
+    def self.translated_value(original_value, model, scope)
+      return original_value if !SiteSetting.experimental_topic_translation
+      return original_value if scope.request.params["show"] == "original"
+
+      translated = model.custom_fields[TRANSLATED_CUSTOM_FIELD]
+      return original_value if (translated.blank? || translated[I18n.locale].blank?)
+
+      translated[I18n.locale]
+    end
+  end
+end

plugin.rb

@@ -48,11 +48,12 @@ module ::DiscourseTranslator
     scope.can_translate?(object)
   end
 
-  add_to_serializer :post, :cooked, false do
-    return super() if !SiteSetting.experimental_topic_translation
-    return super() if scope.request.params["show_original"].present?
-    translated = object.custom_fields[::DiscourseTranslator::TRANSLATED_CUSTOM_FIELD]
-    return super() if (translated.blank? || translated[I18n.locale].blank?)
-    translated[I18n.locale]
+  add_to_serializer :post, :cooked, respect_plugin_enabled: false do
+    return super() if cooked_hidden
+    DiscourseTranslator::TranslatorHelper.translated_value(super(), object, scope)
+  end
+
+  add_to_serializer :basic_topic, :fancy_title do
+    DiscourseTranslator::TranslatorHelper.translated_value(object.fancy_title, object, scope)
   end
 end

spec/serializers/basic_topic_serializer_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe BasicTopicSerializer do
+  let!(:guardian) { Guardian.new(user) }
+  let!(:original_title) { "FUS ROH DAAHHH" }
+  let!(:jap_title) { "フス・ロ・ダ・ア" }
+
+  describe "#fancy_title" do
+    fab!(:user) { Fabricate(:user, locale: "ja") }
+    fab!(:topic) { Fabricate(:topic) }
+
+    before do
+      topic.title = original_title
+      SiteSetting.experimental_topic_translation = true
+      I18n.locale = "ja"
+    end
+
+    def serialize_topic(guardian_user: user, params: {})
+      env = { "action_dispatch.request.parameters" => params, "REQUEST_METHOD" => "GET" }
+      request = ActionDispatch::Request.new(env)
+      guardian = Guardian.new(guardian_user, request)
+      BasicTopicSerializer.new(topic, scope: guardian)
+    end
+
+    it "returns original fancy_title when experimental_topic_translation is disabled" do
+      SiteSetting.experimental_topic_translation = false
+      topic.custom_fields[DiscourseTranslator::TRANSLATED_CUSTOM_FIELD] = { "ja" => jap_title }
+
+      expect(serialize_topic.fancy_title).to eq(original_title)
+    end
+
+    it "returns original fancy_title when show_original param is present" do
+      topic.custom_fields[DiscourseTranslator::TRANSLATED_CUSTOM_FIELD] = { "ja" => jap_title }
+      expect(serialize_topic(params: { "show" => "original" }).fancy_title).to eq(original_title)
+    end
+
+    it "returns original fancy_title when no translation exists" do
+      expect(serialize_topic.fancy_title).to eq(original_title)
+    end
+
+    it "returns original fancy_title when translation is blank for current locale" do
+      topic.custom_fields[DiscourseTranslator::TRANSLATED_CUSTOM_FIELD] = { "ja" => "" }
+      expect(serialize_topic.fancy_title).to eq(original_title)
+    end
+
+    it "returns translated title when translation exists for current locale" do
+      topic.custom_fields[DiscourseTranslator::TRANSLATED_CUSTOM_FIELD] = { "ja" => jap_title }
+      expect(serialize_topic.fancy_title).to eq(jap_title)
+    end
+  end
+end

spec/serializers/post_serializer_spec.rb

@@ -82,16 +82,10 @@
   end
 
   describe "#cooked" do
-    def serialize_post(user: nil, params: {}, cookies: {})
-      env = {
-        "action_dispatch.request.parameters" => params,
-        "REQUEST_METHOD" => "GET",
-        "rack.input" => {
-        },
-        "HTTP_COOKIE" => cookies.map { |k, v| "#{k}=#{v}" }.join(";"),
-      }
+    def serialize_post(guardian_user: user, params: {})
+      env = { "action_dispatch.request.parameters" => params, "REQUEST_METHOD" => "GET" }
       request = ActionDispatch::Request.new(env)
-      guardian = Guardian.new(user, request)
+      guardian = Guardian.new(guardian_user, request)
       PostSerializer.new(post, scope: guardian)
     end
 
@@ -100,14 +94,15 @@ def serialize_post(user: nil, params: {}, cookies: {})
     it "returns original cooked when experimental_topic_translation is disabled" do
       SiteSetting.experimental_topic_translation = false
       original_cooked = post.cooked
-      expect(serialize_post(user: user).cooked).to eq(original_cooked)
+      expect(serialize_post.cooked).to eq(original_cooked)
     end
 
-    it "returns original cooked when show_original param is present" do
+    it "returns original cooked when show=original param is present" do
       original_cooked = post.cooked
-      expect(serialize_post(user: user, params: { "show_original" => "true" }).cooked).to eq(
-        original_cooked,
-      )
+      I18n.locale = "ja"
+      post.custom_fields[DiscourseTranslator::TRANSLATED_CUSTOM_FIELD] = { "ja" => "こんにちは" }
+      expect(serialize_post(params: { "show" => "original" }).cooked).to eq(original_cooked)
+      expect(serialize_post(params: { "show" => "derp" }).cooked).to eq("こんにちは")
     end
 
     it "returns translated content based on locale" do
@@ -116,13 +111,13 @@ def serialize_post(user: nil, params: {}, cookies: {})
         "ja" => "こんにちは",
         "es" => "Hola",
       }
-      expect(serialize_post(user: user).cooked).to eq("こんにちは")
+      expect(serialize_post.cooked).to eq("こんにちは")
     end
 
     it "returns original cooked when plugin is disabled" do
       SiteSetting.translator_enabled = false
       original_cooked = post.cooked
-      expect(serialize_post(user: user).cooked).to eq(original_cooked)
+      expect(serialize_post.cooked).to eq(original_cooked)
     end
   end
 end