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.

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-6560 Add tumblr links to twitter status links #4575

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/views/feedbacks/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<% else %>
<h3 class="heading"><%= t(".heading.instructions") %></h3>
<div class="userstuff">
<p><%= t(".status.current", twitter_link: link_to(t(".status.twitter"), "https://twitter.com/AO3_Status")).html_safe %></p>
<p><%= t(".status.current", twitter_link: link_to(t(".status.twitter"), "https://twitter.com/AO3_Status"), tumblr_link: link_to(t(".status.tumblr", "https://https://ao3org.tumblr.com"))).html_safe %></p>
<p><%= t(".abuse.reports", contact_link: link_to(t(".abuse.contact"), new_abuse_report_path)).html_safe %></p>
<p><%= t(".reportable.intro") %></p>
<ul>
Expand Down
5 changes: 3 additions & 2 deletions config/locales/views/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,9 @@ en:
tag_changes: Requests to canonize or change tags
work_problems: Works labeled with the wrong language or duplicate works
status:
current: 'For current updates on Archive performance or downtime, please check out our Twitter feed: %{twitter_link}.'
twitter: "@AO3_Status"
current: 'For current updates on Archive performance or downtime, please check the %{twitter_link} or %{tumblr_link} '
tumblr: ao3org Tumblr
twitter: '@AO3_Status Twitter feed'
home:
donate:
page_title: Donate or Volunteer
Expand Down
2 changes: 1 addition & 1 deletion features/admins/admin_tasks.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Admin tasks
Given I am logged in as an admin
Then cookie "admin_credentials" should be like "1"
When I go to the support page
Then I should see "Support and Feedback"
Then I should see "Technical Support & Feedback"
And I should see "[email protected]" in the "feedback_email" input
When I log out
And I am on the home page
Expand Down
4 changes: 2 additions & 2 deletions features/other_b/support.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Filing a support request
Given I am logged in as "puzzled"
And basic languages
When time is frozen at 14/3/2022
When I follow "Support & Feedback"
When I follow "Technical Support & Feedback"
When I select "Deutsch" from "feedback_language"
And I fill in "Brief summary" with "Just a brief note"
And I fill in "Your question or problem" with "Men have their old boys' network, but we have the OTW. You guys rock!"
Expand All @@ -19,7 +19,7 @@ Feature: Filing a support request
And the email should contain "We're working hard to reply to everyone, and we'll respond to you as soon as we can."
And the email should contain "If you have additional questions or information"
And the email should contain "Sent at Mon, 14 Mar 2022 12:00:00 \+0000"
When I follow "Support & Feedback"
When I follow "Technical Support & Feedback"
And I fill in "Brief summary" with "you suck"
And I fill in "Your question or problem" with "blah blah blah"
And I fill in "Your email (required)" with "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion public/502.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h2 class="heading">Error 502</h2>
<h3 class="heading">The page was responding too slowly.</h3>
<!--plain english suggestion: There are so many people using the archive right now, we can't show your page. -->
<p>We're experiencing heavy load. The problem should be temporary; try refreshing the page.</p>
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter for updates if this keeps happening.</p>
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter or <a href="https://ao3org.tumblr.com">ao3org</a> on Tumblr for updates if this keeps happening.</p>
</div>
<!-- END main -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion public/503.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h3 class="landmark heading">Site Navigation</h3>
<h2 class="heading">Error 503</h2>
<h3 class="heading">The page was responding too slowly.</h3>
<!--plain english suggestion: There are so many people using the archive right now, we can't show your page. -->
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter for updates if this keeps happening.</p>
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter or <a href="https://ao3org.tumblr.com">ao3org</a> on Tumblr for updates if this keeps happening.</p>
</div>
<!-- END main -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion public/507.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h3 class="landmark heading">Site Navigation</h3>
<h2 class="heading">Error 507</h2>
<h3 class="heading">Exceeded maximum posting rate.</h3>
<p>To combat bots, we are currently banning IP addresses that post too many works in a short time period. If you see this page repeatedly please pause a while between posting works. If you are banned, you will be unable to access the Archive. Access will be restored 24 hours after the ban started.</p>
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter for updates.</p>
<p>Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter or <a href="https://ao3org.tumblr.com">ao3org</a> on Tumblr for updates.</p>
</div>
<!-- END main -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion public/nomaintenance.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h3 class="landmark heading">Site Navigation</h3>
<div id="main" class="system errors error-503-maintenance region">
<h2 class="heading">Error 503 - Service unavailable</h2>
<h3 class="heading">The Archive is down for maintenance.</h3>
<p>If <a href="https://twitter.com/ao3_status/">@AO3_Status</a> says the site is up, but you still see this page, try <a href="https://kb.iu.edu/data/ahic.html">clearing your browser cache</a> and refreshing the page.</p>
<p>If <a href="https://twitter.com/ao3_status/">@AO3_Status</a> and <a href="https://ao3org.tumblr.com">ao3org</a> say the site is up, but you still see this page, try <a href="https://kb.iu.edu/data/ahic.html">clearing your browser cache</a> and refreshing the page.</p
</div>
<!-- END main -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion public/status/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ <h4 class="heading">Development</h4>
$j("#tabs").tabs({
beforeLoad: function(event, ui){
ui.jqXHR.error(function(){
ui.panel.html("We are having issues loading this page." + 'Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter for updates.');
ui.panel.html("We are having issues loading this page." + 'Follow <a href="https://twitter.com/ao3_status/">@AO3_Status</a> on Twitter or <a href="https://ao3org.tumblr.com">ao3org</a> on Tumblr for updates.');
});
}
});
Expand Down