Use question_number, question_text, and route_number consistently

app/components/page_list_component/error_summary/view.rb

@@ -11,7 +11,7 @@ def self.error_id(number)
       end
 
       def error_object(error_name:, condition:, page:)
-        OpenStruct.new(message: I18n.t("page_conditions.errors.#{error_name}", page_index: page.position), link: "##{self.class.error_id(condition.id)}")
+        OpenStruct.new(message: I18n.t("page_conditions.errors.#{error_name}", question_number: page.position), link: "##{self.class.error_id(condition.id)}")
       end
 
       def conditions_with_routing_pages

app/components/page_list_component/view.html.erb

@@ -35,14 +35,14 @@
           <%  conditions_for_page_with_index(page.id).each do |condition, _route_index| %>
             <div id="<%= PageListComponent::ErrorSummary::View.error_id(condition.id) %>" class="govuk-summary-list__row app-page-list__row <%= class_names( "govuk-form-group--error": condition.has_routing_errors?) %>">
               <dt class="govuk-summary-list__key govuk-summary-list__key app-page-list__key">
-                <%= t("page_conditions.condition_name", page_index: condition_page_position(condition)) %>
+                <%= t("page_conditions.condition_name", question_number: condition_page_position(condition)) %>
               </dt>
 
               <dd class="govuk-summary-list__value">
                 <ul class="govuk-list govuk-!-margin-0">
                   <% condition.validation_errors.each do |error| %>
                     <li class="app-page_list__route-text--error">
-                      <%= t("page_conditions.errors.#{error.name}", page_index: page.position) %>
+                      <%= t("page_conditions.errors.#{error.name}", question_number: page.position) %>
                     </li>
                   <% end %>
                 </ul>
@@ -53,7 +53,7 @@
 
               <dd class="govuk-summary-list__actions govuk-!-padding-bottom-6">
                 <%= govuk_link_to show_routes_path(form_id: @form_id, page_id: condition.check_page_id) do %>
-                  <%= t("forms.form_overview.edit_with_visually_hidden_text_html", visually_hidden_text: t("page_conditions.condition_name", page_index: page.position)) %>
+                  <%= t("forms.form_overview.edit_with_visually_hidden_text_html", visually_hidden_text: t("page_conditions.condition_name", question_number: page.position)) %>
                 <% end %>
               </dd>
             </div>

app/components/page_list_component/view.rb

@@ -18,15 +18,15 @@ def show_down_button(index)
 
     def condition_description(condition)
       if condition.secondary_skip?
-        I18n.t("page_conditions.secondary_skip_description", check_page_text: skip_condition_route_page_text(condition), goto_page_text: goto_page_text_for_condition(condition))
+        I18n.t("page_conditions.secondary_skip_description", check_page_question_text: skip_condition_route_page_text(condition), goto_page_question_text: goto_page_text_for_condition(condition))
       else
-        I18n.t("page_conditions.condition_description", check_page_text: condition_check_page_text(condition), goto_page_text: goto_page_text_for_condition(condition), answer_value: answer_value_text_for_condition(condition))
+        I18n.t("page_conditions.condition_description", check_page_question_text: condition_check_page_text(condition), goto_page_question_text: goto_page_text_for_condition(condition), answer_value: answer_value_text_for_condition(condition))
       end
     end
 
     def condition_check_page_text(condition)
       check_page = @pages.find { |page| page.id == condition.check_page_id }
-      I18n.t("page_conditions.condition_check_page_text", check_page_text: check_page.question_text)
+      I18n.t("page_conditions.condition_check_page_text", check_page_question_text: check_page.question_text)
     end
 
     def answer_value_text_for_condition(condition)
@@ -41,7 +41,7 @@ def answer_value_text_for_condition(condition)
     def goto_page_text_for_condition(condition)
       if condition.goto_page_id.present?
         goto_page = @pages.find { |page| page.id == condition.goto_page_id }
-        I18n.t("page_conditions.condition_goto_page_text", goto_page_position: goto_page.position, goto_page_text: goto_page.question_text)
+        I18n.t("page_conditions.condition_goto_page_text", goto_page_question_number: goto_page.position, goto_page_question_text: goto_page.question_text)
       elsif condition.skip_to_end
         I18n.t("page_conditions.condition_goto_page_check_your_answers")
       else
@@ -68,7 +68,7 @@ def routing_conditions_with_index
 
     def skip_condition_route_page_text(condition)
       routing_page = @pages.find { |page| page.id == condition.routing_page_id }
-      I18n.t("page_conditions.skip_condition_route_page_text", route_page_text: routing_page.question_text, route_page_position: routing_page.position)
+      I18n.t("page_conditions.skip_condition_route_page_text", route_page_question_text: routing_page.question_text, route_page_question_number: routing_page.position)
     end
 
     # Create hash of page_id => [condition, index]

app/controllers/pages/conditions_controller.rb

@@ -27,7 +27,7 @@ def create
     condition_input = Pages::ConditionsInput.new(condition_input_params)
 
     if condition_input.submit
-      redirect_to show_routes_path(form_id: current_form.id, page_id: page.id), success: t("banner.success.route_created", question_position: condition_input.page.position)
+      redirect_to show_routes_path(form_id: current_form.id, page_id: page.id), success: t("banner.success.route_created", question_number: condition_input.page.position)
     else
       render template: "pages/conditions/new", locals: { condition_input: }, status: :unprocessable_entity
     end
@@ -51,7 +51,7 @@ def update
     condition_input = Pages::ConditionsInput.new(form_params)
 
     if condition_input.update_condition
-      redirect_to show_routes_path(form_id: current_form.id, page_id: page.id), success: t("banner.success.route_updated", question_position: condition_input.page.position)
+      redirect_to show_routes_path(form_id: current_form.id, page_id: page.id), success: t("banner.success.route_updated", question_number: condition_input.page.position)
     else
       render template: "pages/conditions/edit", locals: { condition_input: }, status: :unprocessable_entity
     end
@@ -74,7 +74,7 @@ def destroy
 
     if delete_condition_input.submit
       if delete_condition_input.confirmed?
-        redirect_to form_pages_path(current_form.id, page.id), success: t("banner.success.route_deleted", question_position: delete_condition_input.page.position)
+        redirect_to form_pages_path(current_form.id, page.id), success: t("banner.success.route_deleted", question_number: delete_condition_input.page.position)
       else
         redirect_to edit_condition_path(current_form.id, page.id, condition.id)
       end

app/controllers/pages/routes_controller.rb

@@ -20,7 +20,7 @@ def destroy
 
     if @delete_confirmation_input.submit
       if @delete_confirmation_input.confirmed?
-        return redirect_to form_pages_path, success: t("banner.success.page_routes_deleted", question_position: current_form.page_number(page))
+        return redirect_to form_pages_path, success: t("banner.success.page_routes_deleted", question_number: current_form.page_number(page))
       end
     else
       return render :delete, locals: { current_form:, page:, delete_confirmation_input: @delete_confirmation_input }, status: :unprocessable_entity

app/controllers/pages_controller.rb

@@ -85,7 +85,7 @@ def move_page
                  page_to_move.position + 1
                end
 
-    redirect_to form_pages_path, success: t("banner.success.form.page_moved", question_text: page_to_move.question_text, direction: move_params[:direction], position:)
+    redirect_to form_pages_path, success: t("banner.success.form.page_moved", question_text: page_to_move.question_text, direction: move_params[:direction], question_number: position)
   end
 
 private

app/input_objects/pages/secondary_skip_input.rb

@@ -59,9 +59,9 @@ def question_name(page_id)
     target_page = FormRepository.pages(form).find { |page| page.id == page_id }
 
     question_text = target_page.question_text
-    page_position = target_page.position
+    question_number = target_page.position
 
-    I18n.t("page_route_card.question_name_long", page_position:, question_text:)
+    I18n.t("page_route_card.question_name_long", question_number:, question_text:)
   end
 
   def end_page_name

app/presenters/route_summary_card_data_presenter.rb

@@ -32,12 +32,12 @@ def conditional_route_cards
     conditional_routes.map.with_index(1) { |routing_condition, index| conditional_route_card(routing_condition, index) }
   end
 
-  def conditional_route_card(routing_condition, index)
+  def conditional_route_card(routing_condition, route_number)
     goto_page_name = routing_condition.skip_to_end ? end_page_name : goto_question_name(routing_condition.goto_page_id)
 
     {
       card: {
-        title: I18n.t("page_route_card.route_title", index:),
+        title: I18n.t("page_route_card.route_title", route_number:),
         classes: "app-summary-card",
         actions: [
           govuk_link_to(I18n.t("page_route_card.edit"), edit_condition_path(form_id: form.id, page_id: page.id, condition_id: routing_condition.id)),
@@ -127,9 +127,9 @@ def question_name(page_id)
     return if target_page.blank?
 
     question_text = target_page.question_text
-    page_position = target_page.position
+    question_number = target_page.position
 
-    I18n.t("page_route_card.question_name_long", page_position:, question_text:)
+    I18n.t("page_route_card.question_name_long", question_number:, question_text:)
   end
 
   def goto_question_name(page_id)

app/services/page_options_service.rb

@@ -158,10 +158,10 @@ def print_route(condition)
       I18n.t("page_conditions.condition_compact_html_end_of_form", answer_value:).html_safe
     else
       goto_question = @pages.find { |page| page.id == condition.goto_page_id }
-      goto_page_text = ActionController::Base.helpers.sanitize(goto_question.question_text)
-      goto_page_number = @pages.find_index(goto_question) + 1
+      goto_page_question_text = ActionController::Base.helpers.sanitize(goto_question.question_text)
+      goto_page_question_number = @pages.find_index(goto_question) + 1
 
-      I18n.t("page_conditions.condition_compact_html", answer_value:, goto_page_number:, goto_page_text:).html_safe
+      I18n.t("page_conditions.condition_compact_html", answer_value:, goto_page_question_number:, goto_page_question_text:).html_safe
     end
   end
 

app/views/pages/conditions/delete.html.erb

@@ -1,4 +1,4 @@
-<% set_page_title(title_with_error_prefix(t("page_titles.routing_page_delete", question_position: delete_condition_input.page.position), delete_condition_input.errors&.any?)) %>
+<% set_page_title(title_with_error_prefix(t("page_titles.routing_page_delete", question_number: delete_condition_input.page.position), delete_condition_input.errors&.any?)) %>
 <% content_for :back_link, govuk_back_link_to(edit_condition_path(delete_condition_input.form.id, delete_condition_input.page.id, delete_condition_input.record.id)) %>
 
 <div class="govuk-grid-row">
@@ -14,7 +14,7 @@
 
       <h1 class="govuk-heading-l">
         <span class="govuk-caption-l"><%= delete_condition_input.form.name %></span>
-        <%= t("page_titles.routing_page_delete", question_position: delete_condition_input.page.position) %>
+        <%= t("page_titles.routing_page_delete", question_number: delete_condition_input.page.position) %>
       </h1>
 
       <%= govuk_summary_list(actions: false) do |summary_list|

app/views/pages/conditions/edit.html.erb

@@ -1,5 +1,5 @@
-<%# TODO: route_position is hardcoded as 1 here because we know there are only two conditions. It will need to change in the future %>
-<% set_page_title(title_with_error_prefix(t('page_titles.routing_page_edit', question_position: condition_input.page.position, route_position: 1), condition_input.errors&.any?)) %>
+<%# TODO: route_number is hardcoded as 1 here because we know there are only two conditions. It will need to change in the future %>
+<% set_page_title(title_with_error_prefix(t('page_titles.routing_page_edit', question_number: condition_input.page.position, route_number: 1), condition_input.errors&.any?)) %>
 <% content_for :back_link, govuk_back_link_to(show_routes_path(condition_input.form.id, page_id: condition_input.page.id)) %>
 
 <div class="govuk-grid-row">
@@ -10,8 +10,8 @@
       <% end %>
 
       <h1 class="govuk-heading-l">
-        <span class="govuk-caption-l"><%= t("page_titles.routing_page_caption", question_position: condition_input.page.position) %></span>
-        <%= t("page_titles.routing_page_edit", question_position: condition_input.page.position, route_position: 1) %>
+        <span class="govuk-caption-l"><%= t("page_titles.routing_page_caption", question_number: condition_input.page.position) %></span>
+        <%= t("page_titles.routing_page_edit", question_number: condition_input.page.position, route_number: 1) %>
       </h1>
 
       <%= govuk_summary_list(actions: false) do |summary_list|

app/views/pages/conditions/new.html.erb

@@ -1,5 +1,5 @@
 <%# TODO: route_position is hardcoded as 1 here because we know there are only two conditions. It will need to change in the future %>
-<% set_page_title(title_with_error_prefix(t('page_titles.routing_page_new', route_position: 1), condition_input.errors&.any?)) %>
+<% set_page_title(title_with_error_prefix(t('page_titles.routing_page_new', route_number: 1), condition_input.errors&.any?)) %>
 <% content_for :back_link, govuk_back_link_to(routing_page_path(condition_input.form.id, routing_page_id: condition_input.page.id)) %>
 
 <div class="govuk-grid-row">
@@ -10,8 +10,8 @@
       <% end %>
 
       <h1 class="govuk-heading-l">
-        <span class="govuk-caption-l"><%= t("page_titles.routing_page_caption", question_position: condition_input.page.position) %></span>
-        <%= t("page_titles.routing_page_new", route_position: 1) %>
+        <span class="govuk-caption-l"><%= t("page_titles.routing_page_caption", question_number: condition_input.page.position) %></span>
+        <%= t("page_titles.routing_page_new", route_number: 1) %>
       </h1>
 
       <%= govuk_summary_list do |summary_list|

app/views/pages/delete.html.erb

@@ -7,11 +7,11 @@
     <% unless @delete_confirmation_input.errors.any? %>
       <% if @routing.present? %>
         <%= govuk_notification_banner(title_text: "Important") do |banner|
-          banner.with_heading(text: t(".notification_banner.#{@routing}.heading_text", page_position: @page.position), tag: :h3)
+          banner.with_heading(text: t(".notification_banner.#{@routing}.heading_text", question_number: @page.position), tag: :h3)
 
           t(
             ".notification_banner.#{@routing}.html",
-            route_page_position: @route_page.position,
+            route_page_question_number: @route_page.position,
             show_routes_href: show_routes_path(current_form.id, @route_page.id),
           )
         end %>

app/views/pages/routes/delete.html.erb

@@ -1,14 +1,14 @@
-<% page_number = current_form.page_number(page) %>
-<% set_page_title(title_with_error_prefix(t(".title", page_number: page_number), delete_confirmation_input.errors.any?)) %>
-<% content_for :back_link, govuk_back_link_to(show_routes_path(form_id: current_form.id, page_id: page.id), t("pages.routes.delete.back", page_number: page_number)) %>
+<% question_number = current_form.page_number(page) %>
+<% set_page_title(title_with_error_prefix(t(".title", question_number:), delete_confirmation_input.errors.any?)) %>
+<% content_for :back_link, govuk_back_link_to(show_routes_path(form_id: current_form.id, page_id: page.id), t("pages.routes.delete.back", question_number:)) %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= render(
       delete_confirmation_input,
       url: destroy_routes_path(current_form.id, page.id),
-      caption_text: t("pages.routes.delete.caption", page_number: page_number),
-      legend_text: t("pages.routes.delete.title", page_number: page_number),
+      caption_text: t("pages.routes.delete.caption", question_number:),
+      legend_text: t("pages.routes.delete.title", question_number:),
       hint_text: nil,
     ) %>
   </div>

app/views/pages/routes/show.html.erb

@@ -1,17 +1,17 @@
-<% set_page_title(title_with_error_prefix(t('page_titles.routes_show', position: page.position), false)) %>
+<% set_page_title(title_with_error_prefix(t('page_titles.routes_show', question_number: page.position), false)) %>
 <% content_for :back_link, govuk_back_link_to(back_link_url, t('pages.go_to_your_questions')) %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
 
       <h1 class="govuk-heading-l">
           <span class="govuk-caption-l"><%= current_form.name %></span>
-          <%= t("page_titles.routes_show", position: page.position) %>
+          <%= t("page_titles.routes_show", question_number: page.position) %>
       </h1>
 
       <%= govuk_summary_list(actions: false) do |summary_list|
           summary_list.with_row do |row|
-              row.with_key { t("page_route_card.question_name_short", position: page.position) }
+              row.with_key { t("page_route_card.question_name_short", question_number: page.position) }
               row.with_value { "#{page.question_text}" }
           end;
       end %>
@@ -23,7 +23,7 @@
       <% if routes.map(&:secondary_skip?).none? %>
         <h2 class="govuk-heading-m"><%= t(".any_other_answer.heading") %></h2>
 
-        <p class="govuk-body"><%= t(".any_other_answer.will_continue_to", next_page_position: next_page.position) %></p>
+        <p class="govuk-body"><%= t(".any_other_answer.will_continue_to", next_question_number: next_page.position) %></p>
 
         <% if FeatureService.new(group: current_form.group).enabled? :branch_routing %>
           <p class="govuk-body"><%= t(".any_other_answer.skip_later") %></p>

app/views/pages/secondary_skip/delete.html.erb

@@ -1,12 +1,12 @@
 <% set_page_title(title_with_error_prefix(t('page_titles.delete_secondary_skip'), false)) %>
-<% content_for :back_link, govuk_back_link_to(back_link_url, t('secondary_skip.new.back', page_position: delete_secondary_skip_input.page.position)) %>
+<% content_for :back_link, govuk_back_link_to(back_link_url, t('secondary_skip.new.back', question_number: delete_secondary_skip_input.page.position)) %>
 
 <%= form_with(model: delete_secondary_skip_input, url: destroy_secondary_skip_path(form_id: delete_secondary_skip_input.form.id, page_id: delete_secondary_skip_input.page.id), method: :delete) do |f| %>
   <% if delete_secondary_skip_input.errors.any? %>
     <%= f.govuk_error_summary %>
   <% end %>
 
-  <span class="govuk-caption-l"><%= t("secondary_skip.new.caption", page_position: delete_secondary_skip_input.page.position) %></span>
+  <span class="govuk-caption-l"><%= t("secondary_skip.new.caption", question_number: delete_secondary_skip_input.page.position) %></span>
 
   <%= f.govuk_collection_radio_buttons :confirm,
     delete_secondary_skip_input.values, ->(option) { option },
@@ -15,4 +15,4 @@
   %>
 
   <%= f.govuk_submit t("save_and_continue") %>
-<% end %>
+<% end %>

app/views/pages/secondary_skip/edit.html.erb

@@ -1,9 +1,9 @@
 <% set_page_title(title_with_error_prefix(t('page_titles.new_secondary_skip', route_index: 2), false)) %>
-<% content_for :back_link, govuk_back_link_to(back_link_url, t('secondary_skip.new.back', page_position: secondary_skip_input.page.position)) %>
+<% content_for :back_link, govuk_back_link_to(back_link_url, t('secondary_skip.new.back', question_number: secondary_skip_input.page.position)) %>
 
 <% content_for :heading do %>
   <h1 class="govuk-heading-l">
-    <span class="govuk-caption-l"><%= t("secondary_skip.new.caption", page_position: secondary_skip_input.page.position) %></span>
+    <span class="govuk-caption-l"><%= t("secondary_skip.new.caption", question_number: secondary_skip_input.page.position) %></span>
     <%= t("page_titles.new_secondary_skip") %>
   </h1>
 <% end %>