A platform for community discussion. Free, open, simple.
FIX: Localize topic titles outside the topic list
Régis Hanol33649ae80541
diff --git a/app/serializers/admin_user_action_serializer.rb b/app/serializers/admin_user_action_serializer.rbindex a07f99b594f..6e833f19229 100644--- a/app/serializers/admin_user_action_serializer.rb+++ b/app/serializers/admin_user_action_serializer.rb@@ -56,7 +56,7 @@ class AdminUserActionSerializer < ApplicationSerializerenddef title- topic&.title+ ContentLocalization.translated_topic_title(topic, scope) || topic&.titleenddef category_iddiff --git a/app/serializers/draft_serializer.rb b/app/serializers/draft_serializer.rbindex 85d62818739..3ff1abf71b0 100644--- a/app/serializers/draft_serializer.rb+++ b/app/serializers/draft_serializer.rb@@ -52,7 +52,7 @@ class DraftSerializer < ApplicationSerializerenddef title- object.topic&.title+ ContentLocalization.translated_topic_title(object.topic, scope) || object.topic&.titleenddef slugdiff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rbindex bca1ac7d093..0f990b68ab6 100644--- a/app/serializers/group_post_serializer.rb+++ b/app/serializers/group_post_serializer.rb@@ -28,11 +28,12 @@ class GroupPostSerializer < ApplicationSerializerhas_one :topic, serializer: BasicTopicSerializer, embed: :objectdef topic_title- object.topic.title+ ContentLocalization.translated_topic_title(object.topic, scope) || object.topic.titleenddef topic_html_title- object.topic.fancy_title+ ContentLocalization.translated_topic_fancy_title(object.topic, scope) ||+ object.topic.fancy_titleenddef topic_slugdiff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rbindex 16597085508..bbe318f4f0d 100644--- a/app/serializers/post_serializer.rb+++ b/app/serializers/post_serializer.rb@@ -146,11 +146,11 @@ class PostSerializer < BasicPostSerializerenddef topic_title- topic&.title+ ContentLocalization.translated_topic_title(topic, scope) || topic&.titleenddef topic_html_title- topic&.fancy_title+ ContentLocalization.translated_topic_fancy_title(topic, scope) || topic&.fancy_titleenddef posts_countdiff --git a/plugins/discourse-reactions/assets/javascripts/discourse/models/discourse-reactions-custom-reaction.js b/plugins/discourse-reactions/assets/javascripts/discourse/models/discourse-reactions-custom-reaction.jsindex 13d8dbaf4a2..5592c8bcac5 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/models/discourse-reactions-custom-reaction.js+++ b/plugins/discourse-reactions/assets/javascripts/discourse/models/discourse-reactions-custom-reaction.js@@ -1,7 +1,6 @@import EmberObject from "@ember/object";import { ajax } from "discourse/lib/ajax";import { emojiUnescape } from "discourse/lib/text";-import { escapeExpression } from "discourse/lib/utilities";import Category from "discourse/models/category";import Post from "discourse/models/post";import RestModel from "discourse/models/rest";@@ -24,7 +23,7 @@ export default class CustomReaction extends RestModel {}static flattenForPostList(reaction) {- const title = reaction.topic.title;+ const { title, fancy_title } = reaction.topic;return {// Original reaction data...reaction,@@ -44,7 +43,7 @@ export default class CustomReaction extends RestModel {post_type: reaction.post.post_type,url: reaction.post.url,title,- titleHtml: title && emojiUnescape(escapeExpression(title)),+ titleHtml: fancy_title && emojiUnescape(fancy_title),category: reaction.category,created_at: reaction.created_at,};diff --git a/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb b/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rbindex 5bbe0fc73a5..67b975ae108 100644--- a/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb+++ b/plugins/discourse-solved/app/serializers/discourse_solved/solved_post_serializer.rb@@ -58,7 +58,8 @@ class DiscourseSolved::SolvedPostSerializer < ApplicationSerializerenddef topic_title- object.topic.fancy_title+ ContentLocalization.translated_topic_fancy_title(object.topic, scope) ||+ object.topic.fancy_titleenddef urldiff --git a/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb b/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rbindex c66c0968838..dbb2641b2d2 100644--- a/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb+++ b/plugins/discourse-solved/spec/requests/solved_topics_controller_spec.rb@@ -24,16 +24,19 @@ describe DiscourseSolved::SolvedTopicsController doexpect(result["user_solved_posts"][0]["post_id"]).to eq(answer_post.id)end- it "returns the translated excerpt" do+ it "returns the translated topic_title and excerpt" doviewer = Fabricate(:user, locale: "ja")SiteSetting.content_localization_enabled = true+ topic.update!(locale: "en")answer_post.update!(raw: "Original answer body", locale: "en")+ Fabricate(:topic_localization, topic: topic, locale: "ja", fancy_title: "翻訳された題名")Fabricate(:post_localization, post: answer_post, locale: "ja", cooked: "<p>翻訳された回答</p>")sign_in(viewer)get "/solution/by_user.json", params: { username: user.username }solved_post = response.parsed_body["user_solved_posts"][0]+ expect(solved_post["topic_title"]).to eq("翻訳された題名")expect(solved_post["excerpt"]).to eq("翻訳された回答")enddiff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rbindex 7966514c9bf..a32cadd6a22 100644--- a/spec/requests/drafts_controller_spec.rb+++ b/spec/requests/drafts_controller_spec.rb@@ -50,6 +50,19 @@ RSpec.describe DraftsController doexpect(response.parsed_body["drafts"].first["title"]).to eq(nil)end+ it "returns the translated topic title" do+ viewer = Fabricate(:user, locale: "ja")+ SiteSetting.content_localization_enabled = true+ topic = Fabricate(:topic, locale: "en")+ Fabricate(:topic_localization, topic: topic, locale: "ja", title: "翻訳された題名")+ Draft.set(viewer, "topic_#{topic.id}", 0, "{}")++ sign_in(viewer)+ get "/drafts.json"++ expect(response.parsed_body["drafts"].first["title"]).to eq("翻訳された題名")+ end+it "omits display user names when names are disabled" doSiteSetting.enable_names = falsetopic_author = Fabricate(:user, name: "Hidden Full Name")diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex a82660138da..42c4a6e1204 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -804,16 +804,19 @@ RSpec.describe GroupsController doexpect(response.parsed_body["posts"].first["id"]).to eq(post.id)end- it "returns the translated excerpt" do+ it "returns the translated topic title and excerpt" doviewer = Fabricate(:user, locale: "ja")SiteSetting.content_localization_enabled = truepost = Fabricate(:post, user: user, raw: "Original group post body", locale: "en")+ post.topic.update!(locale: "en")+ Fabricate(:topic_localization, topic: post.topic, locale: "ja", title: "翻訳された題名")Fabricate(:post_localization, post: post, locale: "ja", cooked: "<p>翻訳された本文</p>")sign_in(viewer)get "/groups/#{group.name}/posts.json"expect(response.status).to eq(200)+ expect(response.parsed_body["posts"].first["topic_title"]).to eq("翻訳された題名")expect(response.parsed_body["posts"].first["excerpt"]).to eq("翻訳された本文")end