From c39a4d7da9021bed9460abb70cc121b83252d112 Mon Sep 17 00:00:00 2001 From: mystyrust Date: Mon, 16 Sep 2024 22:20:03 -0500 Subject: [PATCH 1/5] AO3-6378 update page subtitle for consistency --- app/controllers/series_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb index 620996800cf..6e96332b49b 100644 --- a/app/controllers/series_controller.rb +++ b/app/controllers/series_controller.rb @@ -31,7 +31,7 @@ def index if params[:pseud_id] @pseud = @user.pseuds.find_by!(name: params[:pseud_id]) - @page_subtitle = ts("by ") + @pseud.byline + @page_subtitle = ts("%{username} - Series", username: @pseud.byline) @series = @series.exclude_anonymous.for_pseud(@pseud) else @series = @series.exclude_anonymous.for_user(@user) From 90e1dee6a01afc21e6d1c152b59e9568700b410c Mon Sep 17 00:00:00 2001 From: mystyrust Date: Tue, 17 Sep 2024 22:34:05 -0500 Subject: [PATCH 2/5] AO3-6378 follow i81n to pass rubocop , update series.feature --- app/controllers/series_controller.rb | 4 ++-- config/locales/controllers/en.yml | 2 ++ features/other_b/series.feature | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb index 6e96332b49b..4d9027c5451 100644 --- a/app/controllers/series_controller.rb +++ b/app/controllers/series_controller.rb @@ -21,7 +21,7 @@ def index redirect_to(root_path) and return end @user = User.find_by!(login: params[:user_id]) - @page_subtitle = ts("%{username} - Series", username: @user.login) + @page_subtitle = t('users.page_subtitle.series_page', username: @user.login) @series = if current_user.nil? Series.visible_to_all @@ -31,7 +31,7 @@ def index if params[:pseud_id] @pseud = @user.pseuds.find_by!(name: params[:pseud_id]) - @page_subtitle = ts("%{username} - Series", username: @pseud.byline) + @page_subtitle = t('users.page_subtitle.series_page', username: params[:pseud_id]) @series = @series.exclude_anonymous.for_pseud(@pseud) else @series = @series.exclude_anonymous.for_user(@user) diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml index bc8d7c3a86c..0457234db9c 100644 --- a/config/locales/controllers/en.yml +++ b/config/locales/controllers/en.yml @@ -108,3 +108,5 @@ en: ban_notice_html: Your account has been banned. You are not permitted to add or edit archive content. Please %{contact_abuse_link} for more information. contact_abuse: contact Abuse suspension_notice_html: Your account has been suspended until %{suspended_until}. You may not add or edit content until your suspension has been resolved. Please %{contact_abuse_link} for more information. + page_subtitle: + series_page: "%{username} - Series" diff --git a/features/other_b/series.feature b/features/other_b/series.feature index f1c822734ca..f3ad49d13d1 100644 --- a/features/other_b/series.feature +++ b/features/other_b/series.feature @@ -144,7 +144,7 @@ Feature: Create and Edit Series And I post the work "Sweetie Belle" as part of a series "Ponies" using the pseud "Pointless Pseud" When I follow "Pointless Pseud" And I follow "Series (1)" - Then the page title should include "by Pointless Pseud" + Then the page title should include "Pointless Pseud - Series" Scenario: Rename a series Given I am logged in as a random user From b875251d879cfb7b1d3c4792f84051e97f6d24d5 Mon Sep 17 00:00:00 2001 From: mystyrust Date: Wed, 18 Sep 2024 11:59:49 -0500 Subject: [PATCH 3/5] AO3-6378 double quotes, relative pathing to i18n text --- app/controllers/series_controller.rb | 4 ++-- config/locales/controllers/en.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb index 4d9027c5451..5e15dcb9c93 100644 --- a/app/controllers/series_controller.rb +++ b/app/controllers/series_controller.rb @@ -21,7 +21,7 @@ def index redirect_to(root_path) and return end @user = User.find_by!(login: params[:user_id]) - @page_subtitle = t('users.page_subtitle.series_page', username: @user.login) + @page_subtitle = t(".page_title", username: @user.login) @series = if current_user.nil? Series.visible_to_all @@ -31,7 +31,7 @@ def index if params[:pseud_id] @pseud = @user.pseuds.find_by!(name: params[:pseud_id]) - @page_subtitle = t('users.page_subtitle.series_page', username: params[:pseud_id]) + @page_subtitle = t(".page_title", username: params[:pseud_id]) @series = @series.exclude_anonymous.for_pseud(@pseud) else @series = @series.exclude_anonymous.for_user(@user) diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml index 0457234db9c..8d5d8aacdb6 100644 --- a/config/locales/controllers/en.yml +++ b/config/locales/controllers/en.yml @@ -108,5 +108,6 @@ en: ban_notice_html: Your account has been banned. You are not permitted to add or edit archive content. Please %{contact_abuse_link} for more information. contact_abuse: contact Abuse suspension_notice_html: Your account has been suspended until %{suspended_until}. You may not add or edit content until your suspension has been resolved. Please %{contact_abuse_link} for more information. - page_subtitle: - series_page: "%{username} - Series" + series: + index: + page_title: "%{username} - Series" \ No newline at end of file From dd8f08a28284ac90675437234e8a100ecc129917 Mon Sep 17 00:00:00 2001 From: mystyrust Date: Wed, 18 Sep 2024 13:05:41 -0500 Subject: [PATCH 4/5] AO3-6378 normalize i18n en file --- config/locales/controllers/en.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml index 8d5d8aacdb6..8baeddb68cc 100644 --- a/config/locales/controllers/en.yml +++ b/config/locales/controllers/en.yml @@ -90,6 +90,9 @@ en: muted: You have muted the user %{name}. destroy: unmuted: You have unmuted the user %{name}. + series: + index: + page_title: "%{username} - Series" users: passwords: create: @@ -108,6 +111,3 @@ en: ban_notice_html: Your account has been banned. You are not permitted to add or edit archive content. Please %{contact_abuse_link} for more information. contact_abuse: contact Abuse suspension_notice_html: Your account has been suspended until %{suspended_until}. You may not add or edit content until your suspension has been resolved. Please %{contact_abuse_link} for more information. - series: - index: - page_title: "%{username} - Series" \ No newline at end of file From 102e8582d0ee1cc0896346ae0a9503e076844d43 Mon Sep 17 00:00:00 2001 From: mystyrust Date: Wed, 18 Sep 2024 20:58:32 -0500 Subject: [PATCH 5/5] AO3-6378 pr feedback, reference pseud by object rather than param --- app/controllers/series_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/series_controller.rb b/app/controllers/series_controller.rb index 5e15dcb9c93..4b762078c19 100644 --- a/app/controllers/series_controller.rb +++ b/app/controllers/series_controller.rb @@ -31,7 +31,7 @@ def index if params[:pseud_id] @pseud = @user.pseuds.find_by!(name: params[:pseud_id]) - @page_subtitle = t(".page_title", username: params[:pseud_id]) + @page_subtitle = t(".page_title", username: @pseud.name) @series = @series.exclude_anonymous.for_pseud(@pseud) else @series = @series.exclude_anonymous.for_user(@user)