diff options
| author | Jonne Haß <me@mrzyx.de> | 2014-01-20 13:03:45 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2014-01-20 13:03:45 +0400 |
| commit | 9ea6e9c166a0f66e2239822c116c129eb06a6422 (patch) | |
| tree | 140530eb61158d4b02f0362c04eb4b34c20dcb59 /config/locales | |
| parent | 0e291fd9c43ebb64cf4b35014c0ecbd5f84e877b (diff) | |
| parent | 5c9a3aaf3ea4fc568c572f9de67d94ac64fdafff (diff) | |
Merge pull request #4517 from Zauberstuhl/report_post_feature
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/diaspora/en.yml | 17 | ||||
| -rw-r--r-- | config/locales/javascript/javascript.en.yml | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 8c2c64f5b..0df1e38a9 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: @@ -721,6 +722,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: @@ -849,6 +853,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 3504d75e2..336fd609c 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: "," |