From fd4c70c8804535868d0bea1f36587f0d95dc914f Mon Sep 17 00:00:00 2001 From: sarken Date: Tue, 31 Jan 2023 01:44:17 -0500 Subject: [PATCH] AO3-6365 Text tweaks for muting and blocking (#4446) * AO3-6365 Text tweaks for muting and blocking * AO3-6365 Update i18n key and link for resetting skin FAQ --- app/views/muted/users/confirm_mute.html.erb | 2 +- app/views/muted/users/index.html.erb | 2 +- config/locales/models/en.yml | 4 ++-- config/locales/views/en.yml | 6 +++--- features/users/blocking.feature | 2 +- features/users/muting.feature | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/muted/users/confirm_mute.html.erb b/app/views/muted/users/confirm_mute.html.erb index 42077598407..b9b6b310d2c 100644 --- a/app/views/muted/users/confirm_mute.html.erb +++ b/app/views/muted/users/confirm_mute.html.erb @@ -23,7 +23,7 @@

- <%= t(".site_skin_warning_html", restore_site_skin_faq_link: link_to(t(".restore_site_skin_faq_link_test"), archive_faq_url("skins-and-archive-interface", anchor: :restoresiteskin))) %> + <%= t(".site_skin_warning_html", restore_site_skin_faq_link: link_to(t(".restore_site_skin_faq_link_text"), archive_faq_path("skins-and-archive-interface", anchor: :restoresiteskin))) %>

diff --git a/app/views/muted/users/index.html.erb b/app/views/muted/users/index.html.erb index 4a7a9f2e541..d1bcbfe3291 100644 --- a/app/views/muted/users/index.html.erb +++ b/app/views/muted/users/index.html.erb @@ -26,7 +26,7 @@

- <%= t(".site_skin_warning_html", restore_site_skin_faq_link: link_to(t(".restore_site_skin_faq_link_test"), archive_faq_url("skins-and-archive-interface", anchor: :restoresiteskin))) %> + <%= t(".site_skin_warning_html", restore_site_skin_faq_link: link_to(t(".restore_site_skin_faq_link_text"), archive_faq_path("skins-and-archive-interface", anchor: :restoresiteskin))) %>

diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml index a115dad1920..bf9a7266814 100644 --- a/config/locales/models/en.yml +++ b/config/locales/models/en.yml @@ -10,7 +10,7 @@ en: blocked: blank: "Sorry, we couldn't find a user matching that name." self: "Sorry, you can't block yourself." - official: "Sorry, you can't block an official account." + official: "Sorry, you can't block an official user." limit: "Sorry, you have blocked too many accounts." mute: format: "%{message}" @@ -20,7 +20,7 @@ en: muted: blank: "Sorry, we couldn't find a user matching that name." self: "Sorry, you can't mute yourself." - official: "Sorry, you can't mute an official account." + official: "Sorry, you can't mute an official user." limit: "Sorry, you have muted too many accounts." comment: attributes: diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index c42dfbb6ff6..b22c1124675 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -462,7 +462,7 @@ en: block_users_instead_html: "To prevent a user from commenting on your works or replying to your comments elsewhere on the site, visit %{blocked_users_link}." blocked_users_link_text: "your Blocked Users page" site_skin_warning_html: "Please note that if you are not using the default site skin, muting may not work properly. The Skins and Archive Interface FAQ has %{restore_site_skin_faq_link}." - restore_site_skin_faq_link_test: "instructions for reverting to the default site skin" + restore_site_skin_faq_link_text: "instructions for reverting to the default site skin" confirm_mute: title: "Mute %{name}" button: "Yes, Mute User" @@ -479,7 +479,7 @@ en: block_users_instead_html: "To prevent a user from commenting on your works or replying to your comments elsewhere on the site, visit %{blocked_users_link}." blocked_users_link_text: "your Blocked Users page" site_skin_warning_html: "Please note that if you are not using the default site skin, muting may not work properly. The Skins and Archive Interface FAQ has %{restore_site_skin_faq_link}." - restore_site_skin_faq_link_test: "instructions for reverting to the default site skin" + restore_site_skin_faq_link_text: "instructions for reverting to the default site skin" confirm_unmute: title: "Unmute %{name}" button: "Yes, Unmute User" @@ -488,7 +488,7 @@ en: sure_html: "Are you sure you want to %{unmute} %{username}?" resume: intro: "Unmuting a user allows you to:" - see_content: "see their works, series, bookmarks and comments on the site" + see_content: "see their works, series, bookmarks, and comments on the site" preferences: index: blocked_users: "Blocked Users" diff --git a/features/users/blocking.feature b/features/users/blocking.feature index 4a7515773c4..4d33b27fd45 100644 --- a/features/users/blocking.feature +++ b/features/users/blocking.feature @@ -39,7 +39,7 @@ Feature: Blocking And I am logged in as "blocker" When I go to pest's user page And I follow "Block" - Then I should see "Sorry, you can't block an official account." + Then I should see "Sorry, you can't block an official user." And I should not see a "Yes, Block User" button Scenario: Users cannot block themselves diff --git a/features/users/muting.feature b/features/users/muting.feature index fe5766fe33f..e798650b6a7 100644 --- a/features/users/muting.feature +++ b/features/users/muting.feature @@ -29,7 +29,7 @@ Feature: Muting And I am logged in as "muter" When I go to pest's user page And I follow "Mute" - Then I should see "Sorry, you can't mute an official account." + Then I should see "Sorry, you can't mute an official user." And I should not see a "Yes, Mute User" button Scenario: Users cannot mute themselves