From ca5c5071dde73966c2760b360a69f956622687b4 Mon Sep 17 00:00:00 2001 From: Josh <102478723+realjoshuau@users.noreply.github.com> Date: Tue, 11 Jul 2023 06:35:39 +0000 Subject: [PATCH 1/2] AO3-6560 Add tumblr links to twitter status links --- app/views/feedbacks/new.html.erb | 2 +- config/locales/views/en.yml | 5 +++-- public/502.html | 2 +- public/503.html | 2 +- public/507.html | 2 +- public/nomaintenance.html | 2 +- public/status/index.html | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/feedbacks/new.html.erb b/app/views/feedbacks/new.html.erb index d2dde42cdb5..e4dc3a5718d 100644 --- a/app/views/feedbacks/new.html.erb +++ b/app/views/feedbacks/new.html.erb @@ -21,7 +21,7 @@ <% else %>

<%= t(".heading.instructions") %>

-

<%= t(".status.current", twitter_link: link_to(t(".status.twitter"), "https://twitter.com/AO3_Status")).html_safe %>

+

<%= 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 %>

<%= t(".abuse.reports", contact_link: link_to(t(".abuse.contact"), new_abuse_report_path)).html_safe %>

<%= t(".reportable.intro") %>

diff --git a/public/503.html b/public/503.html index 1a6112a70fd..d37bbaa37ef 100644 --- a/public/503.html +++ b/public/503.html @@ -102,7 +102,7 @@

Site Navigation

Error 503

The page was responding too slowly.

-

Follow @AO3_Status on Twitter for updates if this keeps happening.

+

Follow @AO3_Status on Twitter or ao3org on Tumblr for updates if this keeps happening.

diff --git a/public/507.html b/public/507.html index d4750e5a68f..4d6542e966f 100644 --- a/public/507.html +++ b/public/507.html @@ -102,7 +102,7 @@

Site Navigation

Error 507

Exceeded maximum posting rate.

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.

-

Follow @AO3_Status on Twitter for updates.

+

Follow @AO3_Status on Twitter or ao3org on Tumblr for updates.

diff --git a/public/nomaintenance.html b/public/nomaintenance.html index 4a8dbf3b576..d78b27620da 100644 --- a/public/nomaintenance.html +++ b/public/nomaintenance.html @@ -100,7 +100,7 @@

Site Navigation

Error 503 - Service unavailable

The Archive is down for maintenance.

-

If @AO3_Status says the site is up, but you still see this page, try clearing your browser cache and refreshing the page.

+

If @AO3_Status and ao3org say the site is up, but you still see this page, try clearing your browser cache and refreshing the page.

diff --git a/public/status/index.html b/public/status/index.html index 1958b3d5983..f2abe4e72a4 100644 --- a/public/status/index.html +++ b/public/status/index.html @@ -162,7 +162,7 @@

Development

$j("#tabs").tabs({ beforeLoad: function(event, ui){ ui.jqXHR.error(function(){ - ui.panel.html("We are having issues loading this page." + 'Follow @AO3_Status on Twitter for updates.'); + ui.panel.html("We are having issues loading this page." + 'Follow @AO3_Status on Twitter or ao3org on Tumblr for updates.'); }); } }); From cce68518b70cf20f2fb79621f49be71e0c3596dd Mon Sep 17 00:00:00 2001 From: Josh <102478723+realjoshuau@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:28:36 +0000 Subject: [PATCH 2/2] AO3-6560 Fix some tests. --- config/locales/views/en.yml | 4 ++-- features/admins/admin_tasks.feature | 2 +- features/other_b/support.feature | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index e548cdc560b..5fd8e83105d 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -424,8 +424,8 @@ en: work_problems: Works labeled with the wrong language or duplicate works status: current: 'For current updates on Archive performance or downtime, please check the %{twitter_link} or %{tumblr_link} ' - twitter: "@AO3_Status Twitter feed" - tumblr: "ao3org Tumblr" + tumblr: ao3org Tumblr + twitter: '@AO3_Status Twitter feed' home: donate: page_title: Donate or Volunteer diff --git a/features/admins/admin_tasks.feature b/features/admins/admin_tasks.feature index b53ee8014ff..8286875e96e 100755 --- a/features/admins/admin_tasks.feature +++ b/features/admins/admin_tasks.feature @@ -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 "testadmin@example.org" in the "feedback_email" input When I log out And I am on the home page diff --git a/features/other_b/support.feature b/features/other_b/support.feature index d8733c4e088..ba44380ef0f 100644 --- a/features/other_b/support.feature +++ b/features/other_b/support.feature @@ -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!" @@ -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 "test@archiveofourown.org"