nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report only spam or illegal content

Browse source
This commit is contained in:
flaburgan 2017-08-12 19:32:07 +02:00 committed by Benjamin Neff
parent 8b63eabcbe
commit 1e591b041f
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/views/help_view.js
View file

@ -26,6 +26,7 @@ app.views.Help = app.views.StaticContentView.extend({
}; };
this.POSTS_AND_POSTING_SUBS = { 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: { format_text_a: {
markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )), markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )),
here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' )) here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' ))

2
app/assets/templates/faq_posts_and_posting_tpl.jst.hbs
View file

@ -28,7 +28,7 @@
<a class='toggle' href='#'> <a class='toggle' href='#'>
<h4>{{ post_report_q }}</h4> <h4>{{ post_report_q }}</h4>
</a> </a>
<div class='answer hideable'>{{ post_report_a }}</div> <div class='answer hideable'>{{{ post_report_a }}}</div>
</div> </div>
<div class='question opened collapsible'> <div class='question opened collapsible'>
<a class='toggle' href='#'> <a class='toggle' href='#'>

3
config/locales/diaspora/en.yml
View file

@ -319,6 +319,7 @@ en:
foundation_website: "diaspora* foundation website" foundation_website: "diaspora* foundation website"
third_party_tools: "Third-party tools" third_party_tools: "Third-party tools"
getting_started_tutorial: "”Getting started” tutorial series" getting_started_tutorial: "”Getting started” tutorial series"
community_guidelines: "community guidelines"
getting_help: getting_help:
title: "Getting help" title: "Getting help"
getting_started_q: "Help! I need some basic help to get me started!" 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_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_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_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_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! ;)" 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?" char_limit_services_q: "What if I'm sharing my post with a connected service with a smaller character count?"