From a7ec8c99a37bf4944d693f1aab812b82e8ef0a8f Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 18 Jul 2023 21:51:18 -0700 Subject: [PATCH 1/5] AO3-6560 Add hyperlinks to Tumblr and updated test support form references --- app/views/feedbacks/new.html.erb | 2 +- config/locales/views/en.yml | 5 +++-- features/admins/admin_tasks.feature | 2 +- features/other_b/support.feature | 4 ++-- features/step_definitions/.gitkeep | 0 public/502.html | 2 +- public/503.html | 2 +- public/507.html | 2 +- public/nomaintenance.html | 2 +- public/status/index.html | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 features/step_definitions/.gitkeep diff --git a/app/views/feedbacks/new.html.erb b/app/views/feedbacks/new.html.erb index d2dde42cdb5..aecfa301a66 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://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..28d0d8ea51e 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 dbf78758a7e60ba88a4360a8a17bea826bd9b113 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 18 Jul 2023 21:55:52 -0700 Subject: [PATCH 2/5] AO3-6560 Fix typo in tumblr link --- config/locales/views/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 5bfe4ed1599..4723e241659 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -423,7 +423,7 @@ 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 the %{twitter_link} or %{tumbler_link}.' + 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: From f48489381f8251ad7b341c569f98288fe8557a56 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 18 Jul 2023 21:59:56 -0700 Subject: [PATCH 3/5] AO3-6560 Removing unnecessary test text changes --- features/admins/admin_tasks.feature | 2 +- features/other_b/support.feature | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/admins/admin_tasks.feature b/features/admins/admin_tasks.feature index 8286875e96e..b53ee8014ff 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 "Technical Support & Feedback" + Then I should see "Support and 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 ba44380ef0f..d8733c4e088 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 "Technical Support & Feedback" + When I follow "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 "Technical Support & Feedback" + When I follow "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" From 338ac16754f080eb6823135c719585694d6523cd Mon Sep 17 00:00:00 2001 From: Skawt Date: Tue, 18 Jul 2023 22:05:55 -0700 Subject: [PATCH 4/5] Delete .gitkeep --- features/step_definitions/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 features/step_definitions/.gitkeep diff --git a/features/step_definitions/.gitkeep b/features/step_definitions/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 From b24f152dd0018dc2a603df16e73afadc83787c82 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 18 Jul 2023 22:42:22 -0700 Subject: [PATCH 5/5] AO3-6560 Run i18n tasks to clear up test failures --- config/locales/views/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 4723e241659..8b3d5cdd91f 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -423,8 +423,8 @@ 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 the %{twitter_link} or %{tumblr_link}.' - tumblr: "ao3org Tumblr" + 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: