Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AO3-6922 Update Abuse Form #5075

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+71 −43
Open

AO3-6922 Update Abuse Form #5075

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
809e4f0
abuse form edits
lydia-theda Jan 31, 2025
d846012
Merge branch 'otwcode:master' into abuse-form-updates
lydia-theda Feb 21, 2025
aa760ea
make the tests happier
lydia-theda Feb 21, 2025
77d8ac5
fix language list
lydia-theda Feb 21, 2025
462c761
ugh
lydia-theda Feb 21, 2025
58fa837
run the thingy
lydia-theda Feb 21, 2025
41c3700
fix variables
lydia-theda Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 36 additions & 23 deletions app/views/abuse_reports/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,48 @@
<!--/descriptions-->

<!--subnav-->
<h3 class="landmark heading"><%= t("a11y.navigation") %></h3>
<%= render "home/tos_navigation" %>
<!--/subnav-->

<!--main content-->
<h3 class="landmark heading"><%= t(".page_content_landmark") %></h3>
<div class="userstuff">
<p class="important" id="reportwhat">
<p id="reportwhat"><big><strong>
<%= t(".purview.about_html",
tos_link: (link_to t(".purview.tos"), tos_path)) %>
</p>
tos_link: link_to(t(".purview.tos"), tos_path),
tos_faq_link: link_to(t(".purview.tos_faq"), tos_faq_path(anchor: "how_to_report"))) %>
</strong></big></p>

<p>
<%= t(".purview.technical_help_html",
support_link: (link_to t(".purview.support"), new_feedback_report_path)) %>
<%= t(".purview.contact_support_html",
fnok_link: link_to(t(".purview.fnok"), archive_faq_path("fannish-next-of-kin")),
support_link: link_to(t(".purview.support"), new_feedback_report_path)) %>
</p>

<p>
<%= t(".purview.dmca_takedown_html",
dmca_link: (link_to t(".purview.dmca"), dmca_path)) %>
dmca_abbreviation: tag.abbr(t(".purview.dmca.abbreviated"), title: t(".purview.dmca.full")),
legal_link: link_to(t(".purview.legal"), dmca_path)) %>
</p>

<p id="reportwhy">
<strong>
<%= t(".reportable.intro") %>
<%= t(".reportable.intro_html",
pac_link: link_to(t(".reportable.pac"), "https://www.transformativeworks.org/committees/policy-abuse-committee/")) %>
</strong>
</p>

<ul>
<li><%= t(".reportable.violation_html",
tos_link: (link_to t(".purview.tos"), tos_path, name: "reportwhat")) %></li>
<li><%= t(".reportable.content") %></li>
content_policy_link: link_to(t(".reportable.content_policy"), content_path),
tos_link: link_to(t(".reportable.tos"), tos_path)) %></li>
<li><%= t(".reportable.allowed") %></li>
<li><%= t(".reportable.harassment") %></li>
<li><%= t(".reportable.hack") %></li>
<li><%= t(".reportable.suspended") %></li>
<li><%= t(".reportable.suspended_html",
email_link: link_to(t(".reportable.email"), tos_faq_path(anchor: "complaint_notification"))) %>
</li>
</ul>

<p id="reporthow">
Expand All @@ -45,21 +55,24 @@
</p>

<ul>
<li><%= t(".include.username") %></li>
<li><%= t(".include.links") %></li>
<li><%= t(".include.quote_html",
tos_link: (link_to t(".include.ao3"), tos_path(anchor: "content"))) %></li>
<li><%= t(".include.sources") %></li>
<li><%= t(".include.username_html",
username_link: link_to(t(".include.username"), tos_faq_path(anchor: "user_unknown"))) %></li>
Copy link
Contributor

@Bilka2 Bilka2 Feb 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm slightly worried that the variable, link text and overall sentence all starting with username may be confusing for translators (meaning it's unclear which one is the link text and which one is the sentence). Could username_html maybe be renamed? Best I can come up with is include_username_html.

Same goes for the sources point below, there the three variables also overlap in name.

<li><%= t(".include.other_content") %></li>
<li><%= t(".include.quote") %></li>
<li><%= t(".include.sources_html",
sources_link: link_to(t(".include.sources"), tos_faq_path(anchor: "report_infringement"))) %></li>
</ul>

<p><%= t(".do_not_spam") %></p>
<p>
<%= t(".do_not_spam.paragraph_html",
split_bold: tag.strong(t(".do_not_spam.split")),
delay_link: link_to(t(".do_not_spam.delay"), tos_faq_path(anchor: "complaint_resolution"))) %>
</p>

<p id="reportlanguage">
<strong>
<%= t(".include.languages",
list_html: @abuse_languages.map { |language| tag.span(language.name, lang: language.short) }.to_sentence.html_safe).html_safe %>
</strong>
<%= t(".include.delay") %>
<%= t(".languages.intro_html",
list_html: to_sentence(@abuse_languages.map { |language| tag.span(language.name, lang: language.short) })) %>
<strong><%= t(".languages.delay") %></strong>
</p>
</div>

Expand Down Expand Up @@ -116,8 +129,8 @@
<dd class="required">
<p id="comment-field-description">
<%= t(".form.comment.description_html",
tos_link: (link_to t(".form.comment.tos"), tos_path(anchor: "content")),
include_link: (link_to t(".form.comment.include"), anchor: "reporthow")) %>
tos_link: link_to(t(".form.comment.tos"), tos_path(anchor: "content")),
include_link: link_to(t(".form.comment.include"), anchor: "reporthow")) %>
</p>
<%= f.text_area :comment, "aria-describedby" => "comment-field-description" %>
<%= live_validation_for_field("abuse_report_comment",
Expand Down
56 changes: 36 additions & 20 deletions config/locales/views/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ en:
navigation: Navigation
abuse_reports:
new:
do_not_spam: Please only report one user at a time, and do not submit multiple reports about the same user. Our volunteer team is small, so it may take several months for us to get to your report.
do_not_spam:
delay: it may take several months for us to get to your report
paragraph_html: "%{split_bold} Our volunteer team is small, so %{delay_link}."
split: Please only report one user at a time, and do not submit multiple reports about the same user.
form:
comment:
description_html: Explain what about this content violates the %{tos_link}. Please be as specific as possible and %{include_link}. All information provided will remain confidential.
Expand All @@ -30,34 +33,47 @@ en:
submit:
active: Submit
summary:
description: For example, "harassment", "not a fanwork", "commercial activities", etc.
description: Please specify why you are contacting us and/or what part of the Terms of Service is relevant to your complaint. (For example, "harassment", "not a fanwork", "commercial activities", etc.)
error: Please enter a subject line for your report.
label: Brief summary of Terms of Service violation (required)
heading:
page_title: Policy Questions & Abuse Reports
include:
ao3: AO3 Terms of Service
delay: There will be an additional delay for responses in any language other than English.
ao3: AO3 Terms of Servic
intro: 'What to include in your report description:'
languages: We can answer Abuse reports in %{list_html}.
links: links to any of their other content that you would like to report
quote_html: a quote from or summary of the reported content explaining why it violates the %{tos_link}
sources: links to any relevant sources or screenshots
username: the username of the person you are reporting
other_content: links to any of their other content that you would like to report
quote: a quote from or summary of the content you are reporting that explains why it violates the Terms of Service
sources: sources
sources_html: links to any relevant %{sources_link} or screenshots
username: username of the person you are reporting
username_html: the %{username_link}
languages:
delay: There will be an additional delay for responses in any language other than English.
intro_html: We can answer Abuse reports in %{list_html}.
page_content_landmark: Main Text
purview:
about_html: Please use this form for questions or reports about violations of the Archive's %{tos_link}.
dmca: review our DMCA Policy and contact our Legal team
dmca_takedown_html: If you would like to initiate a formal DMCA takedown request, please %{dmca_link}.
about_html: Please use this form for questions or reports about violations of the %{tos_link}. For more information, please refer to the %{tos_faq_link}.
contact_support_html: If you need technical support, want to report a work tagged with an incorrect language, or would like to manage your %{fnok_link}, please %{support_link}.
dmca:
abbreviated: DMCA
full: Digital Millennium Copyright Act
dmca_takedown_html: If you would like to file a %{dmca_abbreviation} takedown request, please %{legal_link}.
fnok: Fannish Next-of-Kin
legal: review our DMCA Policy and contact our Legal team
support: contact our Support team
technical_help_html: For technical help, or if you would like to manage your Fannish Next-of-Kin, please %{support_link}.
tos: Terms of Service
tos: AO3 Terms of Service
tos_faq: Terms of Service FAQ
reportable:
content: You would like to know whether specific content is allowed on the Archive.
hack: You believe that your account was hacked.
harassment: You have experienced or witnessed harassment on the Archive.
intro: 'Potential reasons to submit a report to the Policy & Abuse team:'
suspended: You have been suspended or your work has been removed, and you have not received an email explaining why.
violation_html: You have encountered content on the Archive that violates the %{tos_link}.
allowed: You would like to know whether specific content is allowed on AO3.
content_policy: Content Policy
email: an email explaining why
hack: You believe that your AO3 account was hacked.
harassment: You have experienced or witnessed harassment taking place on AO3.
intro_html: 'Potential reasons to submit a report to the %{pac_link} team:'
pac: Policy & Abuse
suspended_html: You have been suspended or your work has been removed, and you have not received %{email_link}.
tos: Terms of Service
violation_html: You have encountered content on AO3 that violates the %{content_policy_link} or other parts of the %{tos_link}.
admin:
activities:
index:
Expand Down
Loading