From 412f921e2fc88eaff45464ce83c4cd3be691c764 Mon Sep 17 00:00:00 2001 From: tynka Date: Fri, 8 May 2026 20:34:19 +0200 Subject: [PATCH 1/5] AO3-7413 new external bookmark naming --- app/controllers/external_works_controller.rb | 1 + app/views/external_works/new.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/external_works_controller.rb b/app/controllers/external_works_controller.rb index 7bb9fe4f356..5c928e6f143 100644 --- a/app/controllers/external_works_controller.rb +++ b/app/controllers/external_works_controller.rb @@ -4,6 +4,7 @@ class ExternalWorksController < ApplicationController before_action :check_user_status, only: [:new] def new + @page_subtitle = ts("Bookmark External Work") @bookmarkable = ExternalWork.new @bookmark = Bookmark.new end diff --git a/app/views/external_works/new.html.erb b/app/views/external_works/new.html.erb index 4ba948abb8b..c93bdd2b259 100644 --- a/app/views/external_works/new.html.erb +++ b/app/views/external_works/new.html.erb @@ -1,2 +1,2 @@ -

<%= ts("Bookmark an external work") %>

+

<%= ts("Bookmark External Work") %>

<%= render 'bookmarks/bookmark_form', :bookmarkable => @bookmarkable, :bookmark => @bookmark, :button_name => ts("Create"), :action => 'create' %> From 3bd8e73c84dd439f2d25add30a49b7df1362fe51 Mon Sep 17 00:00:00 2001 From: tynka Date: Fri, 8 May 2026 20:53:39 +0200 Subject: [PATCH 2/5] AO3-7413 fix translations --- app/controllers/external_works_controller.rb | 2 +- app/views/external_works/new.html.erb | 2 +- config/locales/views/en.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/external_works_controller.rb b/app/controllers/external_works_controller.rb index 5c928e6f143..200cbf62c44 100644 --- a/app/controllers/external_works_controller.rb +++ b/app/controllers/external_works_controller.rb @@ -4,7 +4,7 @@ class ExternalWorksController < ApplicationController before_action :check_user_status, only: [:new] def new - @page_subtitle = ts("Bookmark External Work") + @page_subtitle = t(".page_title") @bookmarkable = ExternalWork.new @bookmark = Bookmark.new end diff --git a/app/views/external_works/new.html.erb b/app/views/external_works/new.html.erb index c93bdd2b259..757a2083bbf 100644 --- a/app/views/external_works/new.html.erb +++ b/app/views/external_works/new.html.erb @@ -1,2 +1,2 @@ -

<%= ts("Bookmark External Work") %>

+

<%= t(".page_heading") %>

<%= render 'bookmarks/bookmark_form', :bookmarkable => @bookmarkable, :bookmark => @bookmark, :button_name => ts("Create"), :action => 'create' %> diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 630a3291f93..e2b4150fb46 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -1077,6 +1077,9 @@ en: edit: works_languages_help_title: Languages help notice: This work isn't hosted on the Archive so this blurb might not be complete or accurate. + new: + page_title: Bookmark External Work + page_heading: Bookmark External Work fandoms: index: page_heading: Fandoms From ef58af0027dd384d4ea44548168b8759d9a8a01b Mon Sep 17 00:00:00 2001 From: tynka Date: Fri, 8 May 2026 21:06:29 +0200 Subject: [PATCH 3/5] AO3-7413 normalise locale file --- 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 e2b4150fb46..022266045ac 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -1076,10 +1076,10 @@ en: external_works: edit: works_languages_help_title: Languages help - notice: This work isn't hosted on the Archive so this blurb might not be complete or accurate. new: - page_title: Bookmark External Work page_heading: Bookmark External Work + page_title: Bookmark External Work + notice: This work isn't hosted on the Archive so this blurb might not be complete or accurate. fandoms: index: page_heading: Fandoms From e979f7511c33b362097b27ff6c3577a03345c6c5 Mon Sep 17 00:00:00 2001 From: tynka Date: Fri, 8 May 2026 22:26:04 +0200 Subject: [PATCH 4/5] add a test --- features/bookmarks/bookmark_external.feature | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/features/bookmarks/bookmark_external.feature b/features/bookmarks/bookmark_external.feature index 4fb4034b698..a9f236f3f7f 100644 --- a/features/bookmarks/bookmark_external.feature +++ b/features/bookmarks/bookmark_external.feature @@ -210,3 +210,8 @@ Feature: Create bookmarks of external works When I follow "A Work Not Posted To The AO3" Then I should see "This work isn't hosted on the Archive" And I should see a link to "https://example.com/external_work" within "h4" + + Scenario: A user should see the correct title on the external bookmark page + Given I am logged in as "bookmarker" + When I am on the new external work page + Then I should see the page title "Bookmark External Work" From 1c02686a0f44e14c517cd9a74ed3ae4a22ece5b7 Mon Sep 17 00:00:00 2001 From: tynka Date: Sat, 9 May 2026 09:20:38 +0200 Subject: [PATCH 5/5] fix: move controller translations to proper place --- config/locales/controllers/en.yml | 2 ++ config/locales/views/en.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml index e1198536650..2e3ad663d51 100644 --- a/config/locales/controllers/en.yml +++ b/config/locales/controllers/en.yml @@ -203,6 +203,8 @@ en: timeout_error: browser_title: Timeout Error external_works: + new: + page_title: Bookmark External Work update: successfully_updated: External work was successfully updated. fandoms: diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 022266045ac..8a0dec95baa 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -1078,7 +1078,6 @@ en: works_languages_help_title: Languages help new: page_heading: Bookmark External Work - page_title: Bookmark External Work notice: This work isn't hosted on the Archive so this blurb might not be complete or accurate. fandoms: index: