Revert "Add question marks to yes no questions - test"

This reverts commit 40bee289

app/components/check_answers_summary_list_card_component.rb

@@ -50,7 +50,7 @@ private
     if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id)
       "<span class=\"app-!-colour-red\">You still need to answer this question</span>".html_safe
     else
-      govuk_link_to question.check_answer_prompt_message, correct_validation_action_href(question, log, nil, @correcting_hard_validation), class: "govuk-link govuk-link--no-visited-state"
+      govuk_link_to question.summary_error_message, correct_validation_action_href(question, log, nil, @correcting_hard_validation), class: "govuk-link govuk-link--no-visited-state"
     end
   end
 

app/helpers/check_answers_helper.rb

@@ -64,7 +64,7 @@ private
     if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id)
       "<span class=\"app-!-colour-red\">You still need to answer this question</span>".html_safe
     else
-      govuk_link_to question.check_answer_prompt_message, unanswered_action_href(question, log), class: "govuk-link govuk-link--no-visited-state"
+      govuk_link_to question.summary_error_message, unanswered_action_href(question, log), class: "govuk-link govuk-link--no-visited-state"
     end
   end
 end

app/models/form/question.rb

@@ -243,10 +243,9 @@ class Form::Question
 
   def check_answer_prompt_message
     question_text = lowercase_first_letter(error_label.presence || check_answer_label.presence || header.presence || id.humanize) || "this question."
-    if type == "checkbox" || question_text.end_with?("?")
-      "Answer #{question_text}"
-    else
     case type
+    when "checkbox"
+      "Answer #{question_text}"
     when "radio"
       "Select #{question_text}"
     when "select"
@@ -257,7 +256,6 @@ class Form::Question
       "Enter #{question_text}"
     end
   end
-  end
 
   def suffix_label(log)
     return "" unless suffix

config/locales/forms/2023/lettings/household_characteristics.en.yml

@@ -5,7 +5,7 @@ en:
         household_characteristics:
           declaration:
             page_header: "Ministry of Housing, Communities and Local Government privacy notice"
-            check_answer_label: "Tenant has seen the privacy notice?"
+            check_answer_label: "Tenant has seen the privacy notice"
             hint_text: ""
             question_text: "Declaration"
 
@@ -79,7 +79,7 @@ en:
 
           details_known_2:
             page_header: "You’ve given us the details for 1 person in the household"
-            check_answer_label: "Details known for person 2?"
+            check_answer_label: "Details known for person 2"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 2?"
 
@@ -114,7 +114,7 @@ en:
 
           details_known_3:
             page_header: "You’ve given us the details for 2 people in the household"
-            check_answer_label: "Details known for person 3?"
+            check_answer_label: "Details known for person 3"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 3?"
 
@@ -149,7 +149,7 @@ en:
 
           details_known_4:
             page_header: "You’ve given us the details for 3 people in the household"
-            check_answer_label: "Details known for person 4?"
+            check_answer_label: "Details known for person 4"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 4?"
 
@@ -184,7 +184,7 @@ en:
 
           details_known_5:
             page_header: "You’ve given us the details for 4 people in the household"
-            check_answer_label: "Details known for person 5?"
+            check_answer_label: "Details known for person 5"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 5?"
 
@@ -219,7 +219,7 @@ en:
 
           details_known_6:
             page_header: "You’ve given us the details for 5 people in the household"
-            check_answer_label: "Details known for person 6?"
+            check_answer_label: "Details known for person 6"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 6?"
 
@@ -254,7 +254,7 @@ en:
 
           details_known_7:
             page_header: "You’ve given us the details for 6 people in the household"
-            check_answer_label: "Details known for person 7?"
+            check_answer_label: "Details known for person 7"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 7?"
 
@@ -289,7 +289,7 @@ en:
 
           details_known_8:
             page_header: "You’ve given us the details for 7 people in the household"
-            check_answer_label: "Details known for person 8?"
+            check_answer_label: "Details known for person 8"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 8?"
 

config/locales/forms/2023/lettings/household_needs.en.yml

@@ -5,31 +5,31 @@ en:
         household_needs:
           armedforces:
             page_header: ""
-            check_answer_label: "Household links to UK armed forces?"
+            check_answer_label: "Household links to UK armed forces"
             hint_text: "This excludes national service.<br><br>If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner."
             question_text: "Does anybody in the household have any links to the UK armed forces?"
 
           leftreg:
             page_header: ""
-            check_answer_label: "Person still serving in UK armed forces?"
+            check_answer_label: "Person still serving in UK armed forces"
             hint_text: ""
             question_text: "Is the person still serving in the UK armed forces?"
 
           reservist:
             page_header: ""
-            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces?"
+            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces"
             hint_text: ""
             question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?"
 
           preg_occ:
             page_header: ""
-            check_answer_label: "Anybody in household pregnant?"
+            check_answer_label: "Anybody in household pregnant"
             hint_text: ""
             question_text: "Is anybody in the household pregnant?"
 
           housingneeds:
             page_header: ""
-            check_answer_label: "Anybody with disabled access needs?"
+            check_answer_label: "Anybody with disabled access needs"
             hint_text: ""
             question_text: "Does anybody in the household have any disabled access needs?"
 
@@ -40,13 +40,13 @@ en:
               hint_text: ""
               question_text: "What type of access needs do they have?"
             housingneeds_other:
-              check_answer_label: "Other disabled access needs?"
+              check_answer_label: "Other disabled access needs"
               hint_text: ""
               question_text: "Do they have any other disabled access needs?"
 
           illness:
             page_header: ""
-            check_answer_label: "Anybody in household with physical or mental health condition?"
+            check_answer_label: "Anybody in household with physical or mental health condition"
             hint_text: ""
             question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?"
             
@@ -55,3 +55,4 @@ en:
             check_answer_label: "How is person affected by condition or illness"
             hint_text: "Select all that apply."
             question_text: "How is the person affected by their condition or illness?"
+            

config/locales/forms/2023/lettings/household_situation.en.yml

@@ -51,7 +51,7 @@ en:
 
           homeless:
             page_header: ""
-            check_answer_label: "Household homeless immediately before letting?"
+            check_answer_label: "Household homeless immediately before letting"
             hint_text: ""
             question_text: "Did the household experience homelessness immediately before this letting?"
 
@@ -79,7 +79,7 @@ en:
 
           reasonpref:
             page_header: ""
-            check_answer_label: "Household given reasonable preference?"
+            check_answer_label: "Household given reasonable preference"
             hint_text: "Households may be given ‘reasonable preference’ for social housing, also known as ‘priority need’, by the local authority."
             question_text: "Was the household given ‘reasonable preference’ by the local authority?"
 

config/locales/forms/2023/lettings/income_and_benefits.en.yml

@@ -92,7 +92,7 @@ en:
 
           hbrentshortfall:
             page_header: ""
-            check_answer_label: "Any outstanding amount for basic rent and charges?"
+            check_answer_label: "Any outstanding amount for basic rent and charges"
             hint_text: "Also known as the ‘outstanding amount’."
             question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
 

config/locales/forms/2023/lettings/property_information.en.yml

@@ -87,7 +87,7 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: ""
             question_text: "Is the property built or adapted to wheelchair-user standards?"
 

config/locales/forms/2023/sales/property_information.en.yml

@@ -69,6 +69,6 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: ""
             question_text: "Is the property built or adapted to wheelchair-user standards?"

config/locales/forms/2024/lettings/household_characteristics.en.yml

@@ -78,7 +78,7 @@ en:
 
           details_known_2:
             page_header: "You’ve given us the details for 1 person in the household"
-            check_answer_label: "Details known for person 2?"
+            check_answer_label: "Details known for person 2"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 2?"
 
@@ -113,7 +113,7 @@ en:
 
           details_known_3:
             page_header: "You’ve given us the details for 2 people in the household"
-            check_answer_label: "Details known for person 3?"
+            check_answer_label: "Details known for person 3"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 3?"
 
@@ -148,7 +148,7 @@ en:
 
           details_known_4:
             page_header: "You’ve given us the details for 3 people in the household"
-            check_answer_label: "Details known for person 4?"
+            check_answer_label: "Details known for person 4"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 4?"
 
@@ -183,7 +183,7 @@ en:
 
           details_known_5:
             page_header: "You’ve given us the details for 4 people in the household"
-            check_answer_label: "Details known for person 5?"
+            check_answer_label: "Details known for person 5"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 5?"
 
@@ -218,7 +218,7 @@ en:
 
           details_known_6:
             page_header: "You’ve given us the details for 5 people in the household"
-            check_answer_label: "Details known for person 6?"
+            check_answer_label: "Details known for person 6"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 6?"
 
@@ -253,7 +253,7 @@ en:
 
           details_known_7:
             page_header: "You’ve given us the details for 6 people in the household"
-            check_answer_label: "Details known for person 7?"
+            check_answer_label: "Details known for person 7"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 7?"
 
@@ -288,7 +288,7 @@ en:
 
           details_known_8:
             page_header: "You’ve given us the details for 7 people in the household"
-            check_answer_label: "Details known for person 8?"
+            check_answer_label: "Details known for person 8"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 8?"
 

config/locales/forms/2024/lettings/household_needs.en.yml

@@ -5,31 +5,31 @@ en:
         household_needs:
           armedforces:
             page_header: ""
-            check_answer_label: "Household links to UK armed forces?"
+            check_answer_label: "Household links to UK armed forces"
             hint_text: "This excludes national service.<br><br>If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner."
             question_text: "Does anybody in the household have any links to the UK armed forces?"
 
           leftreg:
             page_header: ""
-            check_answer_label: "Person still serving in UK armed forces?"
+            check_answer_label: "Person still serving in UK armed forces"
             hint_text: ""
             question_text: "Is the person still serving in the UK armed forces?"
 
           reservist:
             page_header: ""
-            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces?"
+            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces"
             hint_text: ""
             question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?"
 
           preg_occ:
             page_header: ""
-            check_answer_label: "Anybody in household pregnant?"
+            check_answer_label: "Anybody in household pregnant"
             hint_text: ""
             question_text: "Is anybody in the household pregnant?"
 
           housingneeds:
             page_header: ""
-            check_answer_label: "Anybody with disabled access needs?"
+            check_answer_label: "Anybody with disabled access needs"
             hint_text: ""
             question_text: "Does anybody in the household have any disabled access needs?"
 
@@ -40,13 +40,13 @@ en:
               hint_text: ""
               question_text: "What type of access needs do they have?"
             housingneeds_other:
-              check_answer_label: "Other disabled access needs?"
+              check_answer_label: "Other disabled access needs"
               hint_text: ""
               question_text: "Do they have any other disabled access needs?"
 
           illness:
             page_header: ""
-            check_answer_label: "Anybody in household with physical or mental health condition?"
+            check_answer_label: "Anybody in household with physical or mental health condition"
             hint_text: ""
             question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?"
             
@@ -55,3 +55,4 @@ en:
             check_answer_label: "How is person affected by condition or illness"
             hint_text: "Select all that apply."
             question_text: "How is the person affected by their condition or illness?"
+            

config/locales/forms/2024/lettings/household_situation.en.yml

@@ -51,7 +51,7 @@ en:
 
           homeless:
             page_header: ""
-            check_answer_label: "Household homeless immediately before letting?"
+            check_answer_label: "Household homeless immediately before letting"
             hint_text: ""
             question_text: "Did the household experience homelessness immediately before this letting?"
 
@@ -79,7 +79,7 @@ en:
 
           reasonpref:
             page_header: ""
-            check_answer_label: "Household given reasonable preference?"
+            check_answer_label: "Household given reasonable preference"
             hint_text: "Households may be given ‘reasonable preference’ for social housing under one or more specific categories by the local authority. This is also known as ‘priority need’."
             question_text: "Was the household given ‘reasonable preference’ by the local authority?"
 

config/locales/forms/2024/lettings/income_and_benefits.en.yml

@@ -92,7 +92,7 @@ en:
 
           hbrentshortfall:
             page_header: ""
-            check_answer_label: "Any outstanding amount for basic rent and charges?"
+            check_answer_label: "Any outstanding amount for basic rent and charges"
             hint_text: "Also known as the ‘outstanding amount’."
             question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
 

config/locales/forms/2024/lettings/property_information.en.yml

@@ -99,7 +99,7 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
             question_text: "Is the property built or adapted to wheelchair-user standards?"
 
@@ -118,7 +118,7 @@ en:
           property_major_repairs:
             page_header: ""
             majorrepairs:
-              check_answer_label: "Major repairs carried out during void period?"
+              check_answer_label: "Major repairs carried out during void period"
               hint_text: "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs."
               question_text: "Were any major repairs carried out during the void period?"
             mrcdate:

config/locales/forms/2024/lettings/setup.en.yml

@@ -82,6 +82,6 @@ en:
 
           declaration:
             page_header: "Ministry of Housing, Communities and Local Government privacy notice"
-            check_answer_label: "Tenant has seen the privacy notice?"
+            check_answer_label: "Tenant has seen the privacy notice"
             hint_text: ""
             question_text: "Declaration"

config/locales/forms/2024/sales/property_information.en.yml

@@ -86,6 +86,6 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
             question_text: "Is the property built or adapted to wheelchair-user standards?"

config/locales/forms/2025/lettings/household_characteristics.en.yml

@@ -78,7 +78,7 @@ en:
 
           details_known_2:
             page_header: "You’ve given us the details for 1 person in the household"
-            check_answer_label: "Details known for person 2?"
+            check_answer_label: "Details known for person 2"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 2?"
 
@@ -113,7 +113,7 @@ en:
 
           details_known_3:
             page_header: "You’ve given us the details for 2 people in the household"
-            check_answer_label: "Details known for person 3?"
+            check_answer_label: "Details known for person 3"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 3?"
 
@@ -148,7 +148,7 @@ en:
 
           details_known_4:
             page_header: "You’ve given us the details for 3 people in the household"
-            check_answer_label: "Details known for person 4?"
+            check_answer_label: "Details known for person 4"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 4?"
 
@@ -183,7 +183,7 @@ en:
 
           details_known_5:
             page_header: "You’ve given us the details for 4 people in the household"
-            check_answer_label: "Details known for person 5?"
+            check_answer_label: "Details known for person 5"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 5?"
 
@@ -218,7 +218,7 @@ en:
 
           details_known_6:
             page_header: "You’ve given us the details for 5 people in the household"
-            check_answer_label: "Details known for person 6?"
+            check_answer_label: "Details known for person 6"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 6?"
 
@@ -253,7 +253,7 @@ en:
 
           details_known_7:
             page_header: "You’ve given us the details for 6 people in the household"
-            check_answer_label: "Details known for person 7?"
+            check_answer_label: "Details known for person 7"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 7?"
 
@@ -288,7 +288,7 @@ en:
 
           details_known_8:
             page_header: "You’ve given us the details for 7 people in the household"
-            check_answer_label: "Details known for person 8?"
+            check_answer_label: "Details known for person 8"
             hint_text: "You must provide details for everyone in the household if you know them."
             question_text: "Do you know details for person 8?"
 

config/locales/forms/2025/lettings/household_needs.en.yml

@@ -5,31 +5,31 @@ en:
         household_needs:
           armedforces:
             page_header: ""
-            check_answer_label: "Household links to UK armed forces?"
+            check_answer_label: "Household links to UK armed forces"
             hint_text: "This excludes national service.<br><br>If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner."
             question_text: "Does anybody in the household have any links to the UK armed forces?"
 
           leftreg:
             page_header: ""
-            check_answer_label: "Person still serving in UK armed forces?"
+            check_answer_label: "Person still serving in UK armed forces"
             hint_text: ""
             question_text: "Is the person still serving in the UK armed forces?"
 
           reservist:
             page_header: ""
-            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces?"
+            check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces"
             hint_text: ""
             question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?"
 
           preg_occ:
             page_header: ""
-            check_answer_label: "Anybody in household pregnant?"
+            check_answer_label: "Anybody in household pregnant"
             hint_text: ""
             question_text: "Is anybody in the household pregnant?"
 
           housingneeds:
             page_header: ""
-            check_answer_label: "Anybody with disabled access needs?"
+            check_answer_label: "Anybody with disabled access needs"
             hint_text: ""
             question_text: "Does anybody in the household have any disabled access needs?"
 
@@ -40,13 +40,13 @@ en:
               hint_text: ""
               question_text: "What type of access needs do they have?"
             housingneeds_other:
-              check_answer_label: "Other disabled access needs?"
+              check_answer_label: "Other disabled access needs"
               hint_text: ""
               question_text: "Do they have any other disabled access needs?"
 
           illness:
             page_header: ""
-            check_answer_label: "Anybody in household with physical or mental health condition?"
+            check_answer_label: "Anybody in household with physical or mental health condition"
             hint_text: ""
             question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?"
 

config/locales/forms/2025/lettings/household_situation.en.yml

@@ -51,7 +51,7 @@ en:
 
           homeless:
             page_header: ""
-            check_answer_label: "Household homeless immediately before letting?"
+            check_answer_label: "Household homeless immediately before letting"
             hint_text: ""
             question_text: "Did the household experience homelessness immediately before this letting?"
 
@@ -79,7 +79,7 @@ en:
 
           reasonpref:
             page_header: ""
-            check_answer_label: "Household given reasonable preference?"
+            check_answer_label: "Household given reasonable preference"
             hint_text: "Households may be given ‘reasonable preference’ for social housing under one or more specific categories by the local authority. This is also known as ‘priority need’."
             question_text: "Was the household given ‘reasonable preference’ by the local authority?"
 

config/locales/forms/2025/lettings/income_and_benefits.en.yml

@@ -92,7 +92,7 @@ en:
 
           hbrentshortfall:
             page_header: ""
-            check_answer_label: "Any outstanding amount for basic rent and charges?"
+            check_answer_label: "Any outstanding amount for basic rent and charges"
             hint_text: "Also known as the ‘outstanding amount’."
             question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
 

config/locales/forms/2025/lettings/property_information.en.yml

@@ -99,7 +99,7 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
             question_text: "Is the property built or adapted to wheelchair-user standards?"
 
@@ -118,7 +118,7 @@ en:
           property_major_repairs:
             page_header: ""
             majorrepairs:
-              check_answer_label: "Major repairs carried out during void period?"
+              check_answer_label: "Major repairs carried out during void period"
               hint_text: "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs."
               question_text: "Were any major repairs carried out during the void period?"
             mrcdate:

config/locales/forms/2025/lettings/setup.en.yml

@@ -82,6 +82,6 @@ en:
 
           declaration:
             page_header: "Ministry of Housing, Communities and Local Government privacy notice"
-            check_answer_label: "Tenant has seen the privacy notice?"
+            check_answer_label: "Tenant has seen the privacy notice"
             hint_text: ""
             question_text: "Declaration"

config/locales/forms/2025/sales/property_information.en.yml

@@ -86,6 +86,6 @@ en:
 
           wchair:
             page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards?"
+            check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
             question_text: "Is the property built or adapted to wheelchair-user standards?"