From c3149216a2ded01baf405461d8babb6852dd216a Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Mon, 24 Feb 2025 21:04:54 +0000 Subject: [PATCH] [653] Update review page titles and h1's To reflect the fact that you are reviewing your answers --- app/helpers/other_qualifications_helper.rb | 4 +++- .../contact_details/review/show.html.erb | 4 ++-- .../degrees/review/show.html.erb | 5 +++-- .../equality_and_diversity/review.html.erb | 4 ++-- .../candidate_interface/gcse/review/show.html.erb | 4 ++-- .../interview_availability/show.html.erb | 2 +- .../personal_details/review/show.html.erb | 2 +- .../personal_statement/show.html.erb | 4 ++-- .../references/review/show.html.erb | 12 ++++++++---- .../review/show.html.erb | 6 +++++- .../safeguarding/show.html.erb | 4 ++-- .../training_with_a_disability/show.html.erb | 4 ++-- .../volunteering/review/show.html.erb | 4 ++-- .../locales/candidate_interface/gcse_details.yml | 4 ++++ config/locales/en.yml | 15 ++++++++++++--- 15 files changed, 51 insertions(+), 27 deletions(-) diff --git a/app/helpers/other_qualifications_helper.rb b/app/helpers/other_qualifications_helper.rb index dce669d2a24..b1806edc711 100644 --- a/app/helpers/other_qualifications_helper.rb +++ b/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') diff --git a/app/views/candidate_interface/contact_details/review/show.html.erb b/app/views/candidate_interface/contact_details/review/show.html.erb index 4950910a672..9369c563570 100644 --- a/app/views/candidate_interface/contact_details/review/show.html.erb +++ b/app/views/candidate_interface/contact_details/review/show.html.erb @@ -1,6 +1,6 @@ <% 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) %> @@ -8,7 +8,7 @@ <%= f.govuk_error_summary %>

- <%= t('page_titles.contact_information') %> + <%= t('page_titles.contact_information_review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/degrees/review/show.html.erb b/app/views/candidate_interface/degrees/review/show.html.erb index 584a417932e..fef1396603c 100644 --- a/app/views/candidate_interface/degrees/review/show.html.erb +++ b/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 %>
+

- <%= t('page_titles.degree') %> + <%= t('page_titles.degree_review', count: @application_form.application_qualifications.degrees.size) %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application: @application_form) %> diff --git a/app/views/candidate_interface/equality_and_diversity/review.html.erb b/app/views/candidate_interface/equality_and_diversity/review.html.erb index b6b3b5475cd..4f4f26cc8bc 100644 --- a/app/views/candidate_interface/equality_and_diversity/review.html.erb +++ b/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) %>
@@ -8,7 +8,7 @@

<%= t('equality_and_diversity.title') %> - Check your answers + Check your answers to equality and diversity questions

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/gcse/review/show.html.erb b/app/views/candidate_interface/gcse/review/show.html.erb index 547a59c9039..41c7437fe66 100644 --- a/app/views/candidate_interface/gcse/review/show.html.erb +++ b/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 %> -

<%= t("gcse_summary.page_titles.#{@subject}") %>

+

<%= t("gcse_summary.page_titles.review.#{@subject}") %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/interview_availability/show.html.erb b/app/views/candidate_interface/interview_availability/show.html.erb index f12fcaa8635..9d8d947a77e 100644 --- a/app/views/candidate_interface/interview_availability/show.html.erb +++ b/app/views/candidate_interface/interview_availability/show.html.erb @@ -5,7 +5,7 @@ <%= f.govuk_error_summary %>

- <%= t('page_titles.interview_preferences.heading') %> + <%= t('page_titles.interview_preferences.review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/personal_details/review/show.html.erb b/app/views/candidate_interface/personal_details/review/show.html.erb index 737d4eb9640..f3d24bf233c 100644 --- a/app/views/candidate_interface/personal_details/review/show.html.erb +++ b/app/views/candidate_interface/personal_details/review/show.html.erb @@ -9,7 +9,7 @@ <%= f.govuk_error_summary %>

- <%= t('page_titles.personal_information.heading') %> + <%= t('page_titles.personal_information.review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/personal_statement/show.html.erb b/app/views/candidate_interface/personal_statement/show.html.erb index a91ec024a57..e8399d982dc 100644 --- a/app/views/candidate_interface/personal_statement/show.html.erb +++ b/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 %>

- <%= t('page_titles.personal_statement') %> + <%= t('page_titles.personal_statement_review') %>

<% if @application_form.review_pending?(:becoming_a_teacher) %> diff --git a/app/views/candidate_interface/references/review/show.html.erb b/app/views/candidate_interface/references/review/show.html.erb index bce79ee891c..de1b1a26b67 100644 --- a/app/views/candidate_interface/references/review/show.html.erb +++ b/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| %>
<%= f.govuk_error_summary %> -

- <%= t('page_titles.references') %> -

+ + <% if @references.any? %> +

<%= t('page_titles.references_review') %>

+ <% else %> +

<%= t('page_titles.references') %>

+ <% end %> <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/restructured_work_history/review/show.html.erb b/app/views/candidate_interface/restructured_work_history/review/show.html.erb index d3c64c3bdcb..4c070b3c9c8 100644 --- a/app/views/candidate_interface/restructured_work_history/review/show.html.erb +++ b/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 %> -

<%= t('page_titles.work_history') %>

+ <% if @application_form.application_work_experiences.blank? %> +

<%= t('page_titles.work_history') %>

+ <% else %> +

<%= t('page_titles.restructured_work_history_review') %>

+ <% end %> <%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/safeguarding/show.html.erb b/app/views/candidate_interface/safeguarding/show.html.erb index 20c774778cd..9372d3802e2 100644 --- a/app/views/candidate_interface/safeguarding/show.html.erb +++ b/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 %>

- <%= t('page_titles.suitability_to_work_with_children') %> + <%= t('page_titles.suitability_to_work_with_children_review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/training_with_a_disability/show.html.erb b/app/views/candidate_interface/training_with_a_disability/show.html.erb index d32c1e0ca47..b3cf3458095 100644 --- a/app/views/candidate_interface/training_with_a_disability/show.html.erb +++ b/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 %>

- <%= t('page_titles.training_with_a_disability') %> + <%= t('page_titles.training_with_a_disability_review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/app/views/candidate_interface/volunteering/review/show.html.erb b/app/views/candidate_interface/volunteering/review/show.html.erb index 03573915999..bea8c98a02a 100644 --- a/app/views/candidate_interface/volunteering/review/show.html.erb +++ b/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 %> -

<%= t('page_titles.volunteering.short') %>

+

<%= t('page_titles.volunteering.review') %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %> diff --git a/config/locales/candidate_interface/gcse_details.yml b/config/locales/candidate_interface/gcse_details.yml index 748458b39f3..93858025c7f 100644 --- a/config/locales/candidate_interface/gcse_details.yml +++ b/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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 79028bf97ed..ceb502cd56d 100644 --- a/config/locales/en.yml +++ b/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,9 @@ en: confirm: Confirm conditions check: Check conditions degree: Degree + degree_review: + 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,17 +225,21 @@ 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 @@ -239,6 +247,7 @@ en: 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 +275,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: