Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Keep highlighted text for quoted replies by ignored users (#7345)

This commit is contained in:
Tarek Khalil 2019-04-09 16:33:12 +01:00 committed by Régis Hanol
parent 9bcd7aacc8
commit 307499e48b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/widgets/post-cooked.js.es6
View File

@ -145,7 +145,11 @@ export default class PostCooked {
const $blockQuote = $("> blockquote", $aside); const $blockQuote = $("> blockquote", $aside);
$aside.data("original-contents", $blockQuote.html()); $aside.data("original-contents", $blockQuote.html());
const originalText = $blockQuote.text().trim(); const originalText =
$blockQuote.text().trim() ||
$("> blockquote", this.attrs.cooked)
.text()
.trim();
$blockQuote.html(I18n.t("loading")); $blockQuote.html(I18n.t("loading"));
let topicId = this.attrs.topicId; let topicId = this.attrs.topicId;
if ($aside.data("topic")) { if ($aside.data("topic")) {

4
config/locales/client.en.yml
View File

@ -2243,7 +2243,7 @@ en:
quote_reply: "Quote" quote_reply: "Quote"
edit_reason: "Reason: " edit_reason: "Reason: "
post_number: "post {{number}}" post_number: "post {{number}}"
ignored: "Hidden content" ignored: "Ignored content"
wiki_last_edited_on: "wiki last edited on" wiki_last_edited_on: "wiki last edited on"
last_edited_on: "post last edited on" last_edited_on: "post last edited on"
reply_as_new_topic: "Reply as linked Topic" reply_as_new_topic: "Reply as linked Topic"
@ -2251,7 +2251,7 @@ en:
continue_discussion: "Continuing the discussion from {{postLink}}:" continue_discussion: "Continuing the discussion from {{postLink}}:"
follow_quote: "go to the quoted post" follow_quote: "go to the quoted post"
show_full: "Show Full Post" show_full: "Show Full Post"
show_hidden: "View hidden content." show_hidden: "View ignored content."
deleted_by_author: deleted_by_author:
one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)" one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"

2
config/locales/server.en.yml
View File

@ -880,7 +880,7 @@ en:
user_must_edit: "<p>This post was flagged by the community and is temporarily hidden.</p>" user_must_edit: "<p>This post was flagged by the community and is temporarily hidden.</p>"
ignored: ignored:
hidden_content: "<p>Hidden content</p>" hidden_content: "<p>Ignored content</p>"
archetypes: archetypes:
regular: regular: