FEATURE: setting suppress reply when quoting

This commit is contained in:
Sam 2014-07-30 10:55:49 +10:00
parent 5c72297695
commit 87dd681497
3 changed files with 4 additions and 1 deletions

View file

@ -206,7 +206,7 @@ class PostSerializer < BasicPostSerializer
end end
def include_reply_to_user? def include_reply_to_user?
object.quoteless? && object.reply_to_user (!SiteSetting.suppress_reply_when_quoting || object.quoteless?) && object.reply_to_user
end end
def include_bookmarked? def include_bookmarked?

View file

@ -727,6 +727,7 @@ en:
send_welcome_message: "Send all new users a welcome private message with a quick start guide." send_welcome_message: "Send all new users a welcome private message with a quick start guide."
suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post." suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post." suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post."
suppress_reply_when_quoting: "Don't show the expandable in-reply-to on a post when post contains any quotes."
topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary." topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary."
topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics." topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."

View file

@ -328,6 +328,8 @@ posting:
suppress_reply_directly_above: suppress_reply_directly_above:
client: true client: true
default: true default: true
suppress_reply_when_quoting:
default: true
post_undo_action_window_mins: 10 post_undo_action_window_mins: 10
max_mentions_per_post: 10 max_mentions_per_post: 10
newuser_max_replies_per_topic: 3 newuser_max_replies_per_topic: 3