[653] Update review page titles and H1's on application form

app/helpers/other_qualifications_helper.rb

@@ -1,6 +1,8 @@
 module OtherQualificationsHelper
   def other_qualifications_title(application_form)
-    if application_form.international_applicant?
+    if params[:controller] == 'candidate_interface/other_qualifications/review'
+      I18n.t('page_titles.other_qualifications_review')
+    elsif application_form.international_applicant?
       I18n.t('page_titles.other_qualifications_international')
     else
       I18n.t('page_titles.other_qualifications')

app/views/candidate_interface/contact_details/review/show.html.erb

@@ -1,14 +1,14 @@
 <% content_for(
   :title,
-  title_with_error_prefix(t('page_titles.contact_information'), @contact_details_form&.errors&.any?),
+  title_with_error_prefix(t('page_titles.contact_information_review'), @contact_details_form&.errors&.any?),
 ) %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_contact_information_complete_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.contact_information') %>
+    <%= t('page_titles.contact_information_review') %>
   </h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/degrees/review/show.html.erb

@@ -1,12 +1,13 @@
-<% content_for :title, t('page_titles.degree') %>
+<% content_for :title, t('page_titles.degree_review', count: @application_form.application_qualifications.degrees.size) %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_degree_complete_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+
       <h1 class="govuk-heading-xl">
-        <%= t('page_titles.degree') %>
+        <%= t('page_titles.degree_review', count: @application_form.application_qualifications.degrees.size) %>
       </h1>
 
       <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application: @application_form) %>

app/views/candidate_interface/equality_and_diversity/review.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title, 'Check your answers' %>
+<% content_for :title, 'Check your answers to equality and diversity questions' %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <div class="govuk-grid-row">
@@ -8,7 +8,7 @@
 
       <h1 class="govuk-heading-xl">
         <span class="govuk-caption-xl"><%= t('equality_and_diversity.title') %></span>
-        Check your answers
+        Check your answers to equality and diversity questions
       </h1>
 
       <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/gcse/review/show.html.erb

@@ -1,10 +1,10 @@
-<% content_for :title, t("gcse_summary.page_titles.#{@subject}") %>
+<% content_for :title, t("gcse_summary.page_titles.review.#{@subject}") %>
 <% content_for(:before_content, govuk_back_link_to(application_form_path)) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_gcse_complete_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
-  <h1 class="govuk-heading-xl"><%= t("gcse_summary.page_titles.#{@subject}") %></h1>
+  <h1 class="govuk-heading-xl"><%= t("gcse_summary.page_titles.review.#{@subject}") %></h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
 

app/views/candidate_interface/interview_availability/show.html.erb

@@ -5,7 +5,7 @@
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.interview_preferences.heading') %>
+    <%= t('page_titles.interview_preferences.review') %>
   </h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/personal_details/review/show.html.erb

@@ -9,7 +9,7 @@
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.personal_information.heading') %>
+    <%= t('page_titles.personal_information.review') %>
   </h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/personal_statement/show.html.erb

@@ -1,11 +1,11 @@
-<% content_for :title, t('page_titles.becoming_a_teacher') %>
+<% content_for :title, t('page_titles.personal_statement_review') %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_becoming_a_teacher_complete_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.personal_statement') %>
+    <%= t('page_titles.personal_statement_review') %>
   </h1>
 
   <% if @application_form.review_pending?(:becoming_a_teacher) %>

app/views/candidate_interface/references/review/show.html.erb

@@ -1,13 +1,17 @@
-<% content_for :title, title_with_error_prefix(t('page_titles.references'), @section_complete_form.errors.any?) %>
+<% content_for :title, title_with_error_prefix(t(@references.any? ? 'page_titles.references_review' : 'page_titles.references'), @section_complete_form.errors.any?) %>
+
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_references_complete_path, method: :patch do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
-      <h1 class="govuk-heading-l">
-        <%= t('page_titles.references') %>
-      </h1>
+
+      <% if @references.any? %>
+        <h1 class="govuk-heading-l"><%= t('page_titles.references_review') %></h1>
+      <% else %>
+        <h1 class="govuk-heading-l"><%= t('page_titles.references') %></h1>
+      <% end %>
 
       <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
 

app/views/candidate_interface/restructured_work_history/review/show.html.erb

@@ -4,7 +4,11 @@
 <%= form_with model: @section_complete_form, url: candidate_interface_restructured_work_history_complete_path(@return_to[:params]), method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
-  <h1 class="govuk-heading-xl"><%= t('page_titles.work_history') %></h1>
+  <% if @application_form.application_work_experiences.blank? %>
+    <h1 class="govuk-heading-xl"><%= t('page_titles.work_history') %></h1>
+  <% else %>
+    <h1 class="govuk-heading-xl"><%= t('page_titles.restructured_work_history_review') %></h1>
+  <% end %>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
 

app/views/candidate_interface/safeguarding/show.html.erb

@@ -1,11 +1,11 @@
-<% content_for :title, t('page_titles.suitability_to_work_with_children') %>
+<% content_for :title, t('page_titles.suitability_to_work_with_children_review') %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_complete_safeguarding_path, method: :post do |f| %>
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.suitability_to_work_with_children') %>
+    <%= t('page_titles.suitability_to_work_with_children_review') %>
   </h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/training_with_a_disability/show.html.erb

@@ -1,11 +1,11 @@
-<% content_for :title, t('page_titles.training_with_a_disability') %>
+<% content_for :title, t('page_titles.training_with_a_disability_review') %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_training_with_a_disability_complete_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
   <h1 class="govuk-heading-xl">
-    <%= t('page_titles.training_with_a_disability') %>
+    <%= t('page_titles.training_with_a_disability_review') %>
   </h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

app/views/candidate_interface/volunteering/review/show.html.erb

@@ -1,10 +1,10 @@
-<% content_for :title, t('page_titles.volunteering.short') %>
+<% content_for :title, t('page_titles.volunteering.review') %>
 <% content_for :before_content, govuk_back_link_to(application_form_path) %>
 
 <%= form_with model: @section_complete_form, url: candidate_interface_complete_volunteering_path, method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
-  <h1 class="govuk-heading-xl"><%= t('page_titles.volunteering.short') %></h1>
+  <h1 class="govuk-heading-xl"><%= t('page_titles.volunteering.review') %></h1>
 
   <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
 

config/locales/candidate_interface/gcse_details.yml

@@ -67,6 +67,10 @@ en:
     enic_cost: A statement from UK ENIC costs £49.50 and takes 15 working days to arrive.
   gcse_summary:
     page_titles:
+      review:
+        maths: Check your maths GCSE or equivalent
+        english: Check your English GCSE or equivalent
+        science: Check your science GCSE or equivalent
       maths: Maths GCSE or equivalent
       english: English GCSE or equivalent
       science: Science GCSE or equivalent

config/locales/en.yml

@@ -122,7 +122,7 @@ en:
     efl:
       ielts: Your IELTS result
       other: Your English language assessment result
-      review: English as a foreign language
+      review: Check your English as a foreign language assessment
       start: English as a foreign language assessment
       toefl: Your TOEFL result
       type: What English language assessment did you do?
@@ -172,6 +172,7 @@ en:
     roadmap: Changes to services for teacher training providers and candidates
     candidate_complaints: Make a complaint or give feedback
     contact_information: Contact information
+    contact_information_review: Check your contact information
     contact_details: Contact details
     where_do_you_live: Where do you live?
     address: What is your address?
@@ -183,6 +184,10 @@ en:
       confirm: Confirm conditions
       check: Check conditions
     degree: Degree
+    degree_review:
+      zero: Degree
+      one: Check your degree
+      other: Check your degrees
     degree_country: Which country was the degree from?
     degree_completion_status: Have you completed your degree?
     degree_grade: What grade is your degree?
@@ -221,24 +226,29 @@ en:
     edit_degree_type: Edit degree type
     other_qualifications: A levels and other qualifications
     other_qualifications_international: Other qualifications
+    other_qualifications_review: Check your other qualifications
     qualification_details: Qualification details
     edit_other_qualification: Edit qualification
     destroy_other_qualification: Are you sure you want to delete this qualification?
     personal_statement: Personal statement
+    personal_statement_review: Check your personal statement
     becoming_a_teacher: Why you want to teach
     interview_preferences:
       heading: Interview availability
       edit: Edit your interview availability
-      review: Check your interview availability
+      review: Check your answers to interview availability
     training_with_a_disability: Ask for support if you are disabled
+    training_with_a_disability_review: Check your answers to asking for support if you are disabled
     suitability_to_work_with_children: Declare any safeguarding issues
+    suitability_to_work_with_children_review: Check your safeguarding declaration
     thank_you: Thank you for your feedback
     english_gcse: English GCSE or equivalent
     maths_gcse: Maths GCSE or equivalent
     science_gcse: Science GCSE or equivalent
     volunteering:
       short: Unpaid experience
       long: Unpaid experience working with children and other volunteering
+      review: Check your unpaid experience
     add_volunteering_role: Add role
     edit_volunteering_role: Edit role
     destroy_volunteering_role: Are you sure you want to delete this role?
@@ -266,7 +276,7 @@ en:
     references_request_reference_review: Check your answers before sending your request
     references_select: Which 2 references do you want to include in your application?
     references_request: Add your references
-    references_review: Review your references
+    references_review: Check your references
     references_selection: Select 2 references
     find_feedback: Help us improve this service
     referee:

spec/support/test_helpers/candidate_helper.rb

@@ -92,7 +92,7 @@ def candidate_completes_application_form(with_referees: true, international: fal
     end
 
     if international
-      click_link_or_button t('page_titles.efl.review')
+      click_link_or_button 'English as a foreign language'
       choose 'No, English is not a foreign language to me'
       click_link_or_button 'Continue'
       choose 'Yes, I have completed this section'
@@ -387,7 +387,7 @@ def candidate_fills_in_international_contact_details
   end
 
   def candidate_fills_in_efl_section
-    click_link_or_button t('page_titles.efl.review')
+    click_link_or_button 'English as a foreign language'
     choose 'No, English is not a foreign language to me'
     click_link_or_button t('continue')
     choose 'Yes, I have completed this section'
@@ -499,7 +499,7 @@ def candidate_completes_details_except_science(with_referees: true, internationa
     end
 
     if international
-      click_link_or_button t('page_titles.efl.review')
+      click_link_or_button 'English as a foreign language'
       choose 'No, English is not a foreign language to me'
       click_link_or_button 'Continue'
       choose 'Yes, I have completed this section'

spec/system/candidate_interface/entering_details/candidate_becoming_a_teacher_spec.rb

@@ -52,7 +52,7 @@ def and_i_fill_in_an_answer
   end
 
   def then_i_can_check_my_answers
-    expect(page).to have_content 'Personal statement'
+    expect(page).to have_content 'Check your personal statement'
     expect(page).to have_content 'Hello world'
   end
 
@@ -73,7 +73,7 @@ def and_i_fill_in_a_different_answer
   end
 
   def then_i_can_check_my_revised_answers
-    expect(page).to have_content 'Personal statement'
+    expect(page).to have_content 'Check your personal statement'
     expect(page).to have_content 'Hello world again'
   end
 

spec/system/candidate_interface/entering_details/candidate_entering_interview_preferences_spec.rb

@@ -56,7 +56,7 @@ def when_i_choose_yes_and_enter_my_preferences
   end
 
   def then_i_can_check_my_answers
-    expect(page).to have_content t('page_titles.interview_preferences.heading')
+    expect(page).to have_content 'Check your answers to interview availability'
     expect(page).to have_content 'Hello world'
   end
 
@@ -69,7 +69,7 @@ def and_i_choose_no
   end
 
   def then_i_can_check_my_revised_answers
-    expect(page).to have_content t('page_titles.interview_preferences.heading')
+    expect(page).to have_content 'Check your answers to interview availability'
     expect(page).to have_content t('application_form.interview_preferences.no_value')
   end
 

spec/system/candidate_interface/entering_details/candidate_entering_suitability_to_work_with_children_spec.rb

@@ -60,7 +60,7 @@ def and_i_click_on_continue
   end
 
   def then_i_see_my_relevant_information
-    expect(page).to have_content(t('page_titles.suitability_to_work_with_children'))
+    expect(page).to have_content('Check your safeguarding declaration')
     expect(page).to have_content('I have a criminal conviction.')
   end
 
@@ -73,7 +73,7 @@ def when_i_choose_no
   end
 
   def then_i_see_my_updated_answer
-    expect(page).to have_content(t('page_titles.suitability_to_work_with_children'))
+    expect(page).to have_content 'Check your safeguarding declaration'
     expect(page).to have_content('No')
   end
 

spec/system/candidate_interface/entering_details/candidate_personal_statement_spec.rb

@@ -71,7 +71,7 @@ def when_i_fill_in_an_answer
   end
 
   def then_i_can_check_my_answers
-    expect(page).to have_content 'Personal statement'
+    expect(page).to have_content 'Check your personal statement'
     expect(page).to have_content 'Hello world'
   end
 
@@ -102,7 +102,7 @@ def when_i_click_to_edit_my_answer
   end
 
   def then_i_can_check_my_revised_answers
-    expect(page).to have_content 'Personal statement'
+    expect(page).to have_content 'Check your personal statement'
     expect(page).to have_content 'Hello world again'
   end
 

spec/system/candidate_interface/entering_details/restructured_work_history/candidate_can_add_jobs_if_they_have_a_submitted_application_spec.rb

@@ -28,7 +28,7 @@ def and_i_have_a_submitted_application
   end
 
   def then_i_do_see_an_option_to_add_another_job
-    expect(page).to have_content 'Work history'
+    expect(page).to have_content 'Check your work history'
     expect(page).to have_content 'Add another job'
   end
 end

spec/system/candidate_interface/references/backlinks_spec.rb

@@ -135,7 +135,7 @@ def and_provide_my_relationship_to_the_referee
   end
 
   def then_i_see_the_references_review_page
-    expect(page).to have_css('h1', text: 'References to be requested if you accept an offer')
+    expect(page).to have_css('h1', text: 'Check your references')
   end
 
   def and_my_referees_details

spec/system/candidate_interface/submitting/candidate_is_interrupted_because_references_have_personal_email_addresses_spec.rb

@@ -106,7 +106,7 @@ def then_i_can_submit_my_application_choice
 
   def then_i_see_the_references_review_page
     expect(page).to have_current_path(candidate_interface_references_review_path)
-    expect(page).to have_content 'References to be requested if you accept an offer'
+    expect(page).to have_content 'Check your references'
   end
 
   def and_i_can_change_the_a_references_email_address