From 1e591b041f3a4deeda28c812ca852f30c3116375 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sat, 12 Aug 2017 19:32:07 +0200
Subject: [PATCH] Report only spam or illegal content

---
 app/assets/javascripts/app/views/help_view.js          | 1 +
 app/assets/templates/faq_posts_and_posting_tpl.jst.hbs | 2 +-
 config/locales/diaspora/en.yml                         | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js
index db4f67d08..bfa51a450 100644
--- a/app/assets/javascripts/app/views/help_view.js
+++ b/app/assets/javascripts/app/views/help_view.js
@@ -26,6 +26,7 @@ app.views.Help = app.views.StaticContentView.extend({
 	};
 
     this.POSTS_AND_POSTING_SUBS = {
+      post_report_a: {community_guidelines: this.linkHtml("https://diasporafoundation.org/community_guidelines", Diaspora.I18n.t("community_guidelines"))},
       format_text_a: {
         markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )),
         here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' ))
diff --git a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
index 10af52769..0d268d5af 100644
--- a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
+++ b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
@@ -28,7 +28,7 @@
     <a class='toggle' href='#'>
       <h4>{{ post_report_q }}</h4>
     </a>
-    <div class='answer hideable'>{{ post_report_a }}</div>
+    <div class='answer hideable'>{{{ post_report_a }}}</div>
   </div>
   <div class='question opened collapsible'>
     <a class='toggle' href='#'>
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index ff6d00120..fd3397844 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -319,6 +319,7 @@ en:
     foundation_website: "diaspora* foundation website"
     third_party_tools: "Third-party tools"
     getting_started_tutorial: "”Getting started” tutorial series"
+    community_guidelines: "community guidelines"
     getting_help:
       title: "Getting help"
       getting_started_q: "Help! I need some basic help to get me started!"
@@ -402,7 +403,7 @@ en:
       post_notification_q: "How do I get notifications, or stop getting notifications, about a post?"
       post_notification_a: "You will find a bell icon next to the X at the top right of a post. Click this to enable or disable notifications for that post."
       post_report_q: "How do I report an offensive post?"
-      post_report_a: "Click the alert triangle icon at the top right of the post to report it to your podmin. Enter a reason for reporting this post in the dialog box."
+      post_report_a: "Click the alert triangle icon at the top right of the post to report it to your podmin. Enter a reason for reporting this post in the dialog box. Please only report posts that break our %{community_guidelines} or your pod’s terms of service, for example posts containing illegal content, or which are abusive or spam."
       character_limit_q: "What is the character limit for posts?"
       character_limit_a: "65,535 characters. That’s 65,395 more characters than you get on Twitter! ;)"
       char_limit_services_q: "What if I'm sharing my post with a connected service with a smaller character count?"