Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Matt <lukas@zauberstuhl.de>2013-09-12 16:46:59 +0400
committerLukas Matt <lukas@zauberstuhl.de>2014-01-15 00:00:55 +0400
commit5c9a3aaf3ea4fc568c572f9de67d94ac64fdafff (patch)
tree487d48507985f26330b839e5ef0fb24f4905531e /config/locales
parent1a8541ff1ab31203d68030fe9dcdea14d848e47a (diff)
Added post report feature
You can report a single post by clicking the correct icon in the controler section Workflow: * Report a post as offensive * Trigger alerts to every pod-admin * Pod-admin can review it in the admin interface * Delete the post or mark it as reviewed
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/diaspora/en.yml17
-rw-r--r--config/locales/javascript/javascript.en.yml3
2 files changed, 20 insertions, 0 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 4204c6286..d78ae4f60 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -91,6 +91,7 @@ en:
user_search: "User Search"
weekly_user_stats: "Weekly User Stats"
pod_stats: "Pod Stats"
+ post_report: "Reported Posts"
correlations: "Correlations"
sidekiq_monitor: "Sidekiq monitor"
correlations:
@@ -716,6 +717,9 @@ en:
confirm_email:
subject: "Please activate your new email address %{unconfirmed_email}"
click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:"
+ post_report_email:
+ subject: "A new post was marked as offensive"
+ body: "Please review as soon as possible!"
accept_invite: "Accept Your diaspora* invite!"
invited_you: "%{name} invited you to diaspora*"
invite:
@@ -845,6 +849,19 @@ en:
other: "%{count} photos by %{author}"
reshare_by: "Reshare by %{author}"
+ post_report:
+ title: "Marked Reports Overview"
+ post_label: "<b>Post</b>: %{title}"
+ reported_label: "<b>Reported by</b> %{person}"
+ reason_label: "Reason: %{text}"
+ review_link: "Mark as reviewed"
+ delete_link: "Delete post"
+ status:
+ marked: "The report was marked as reviewed"
+ destroyed: "The post was destroyed"
+ created: "A report was created"
+ failed: "Something went wrong"
+
share_visibilites:
update:
post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index c52b13398..170b1996b 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -6,8 +6,11 @@
en:
javascripts:
confirm_dialog: "Are you sure?"
+ post_report_prompt: "Please enter a reason:"
+ post_report_prompt_default: "offensive content"
delete: "Delete"
ignore: "Ignore"
+ post_report: "Report"
ignore_user: "Ignore this user?"
and: "and"
comma: ","