From 631efff0b4e5b0af54de43b1b9c1de47fe0df161 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Thu, 12 May 2022 16:30:39 +0100 Subject: [PATCH] update content --- app/helpers/interruption_screen_helper.rb | 18 ++ app/models/case_log.rb | 15 ++ .../_interruption_screen_question.html.erb | 2 +- config/forms/2021_2022.json | 240 ++++++++++++----- config/forms/2022_2023.json | 244 +++++++++++++----- config/locales/en.yml | 11 +- .../interruption_screen_helper_spec.rb | 27 ++ 7 files changed, 422 insertions(+), 135 deletions(-) diff --git a/app/helpers/interruption_screen_helper.rb b/app/helpers/interruption_screen_helper.rb index cb2c493ef..cdae41c7a 100644 --- a/app/helpers/interruption_screen_helper.rb +++ b/app/helpers/interruption_screen_helper.rb @@ -20,4 +20,22 @@ module InterruptionScreenHelper "" end end + + def display_title_text(title_text, case_log) + if title_text["arguments"] + translation_params = {} + title_text["arguments"].each do |argument| + value = if argument["label"] + case_log.form.get_question(argument["key"], case_log).answer_label(case_log).downcase + else + case_log.public_send(argument["key"]) + end + translation_params[argument["i18n_template"].to_sym] = value + end + translation = I18n.t(title_text["translation"], **translation_params) + else + translation = I18n.t(title_text) + end + translation.to_s + end end diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 791a8a67f..2754b0445 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -380,6 +380,10 @@ class CaseLog < ApplicationRecord define_method("retirement_age_for_person_#{person_num}") do retirement_age_for_person(person_num) end + + define_method("plural_gender_for_person_#{person_num}") do + plural_gender_for_person(person_num) + end end def retirement_age_for_person(person_num) @@ -389,6 +393,17 @@ class CaseLog < ApplicationRecord RETIREMENT_AGES[gender] end + def plural_gender_for_person(person_num) + gender = public_send("sex#{person_num}".to_sym) + return unless gender + if gender == "M" || gender == "X" + return "men and non-binary people" + elsif gender == "F" + return "women" + end + end + + private PIO = Postcodes::IO.new diff --git a/app/views/form/_interruption_screen_question.html.erb b/app/views/form/_interruption_screen_question.html.erb index 427cff471..c17c7bd84 100644 --- a/app/views/form/_interruption_screen_question.html.erb +++ b/app/views/form/_interruption_screen_question.html.erb @@ -1,5 +1,5 @@ <%= govuk_panel( - title_text: I18n.t(title_text), + title_text: display_title_text(title_text, case_log), classes: "app-panel--interruption", ) do %>

<%= display_informative_text(informative_text, case_log) %>

diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 8bc35d612..8987f2a03 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1531,12 +1531,19 @@ }, "lead_tenant_under_retirement_value_check": { "depends_on": [{ "person_1_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_1", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex1", - "label": true, + "key": "plural_gender_for_person_1", + "label": false, "i18n_template": "gender" }, { @@ -1549,7 +1556,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -1564,12 +1571,19 @@ }, "lead_tenant_over_retirement_value_check": { "depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_1", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex1", - "label": true, + "key": "plural_gender_for_person_1", + "label": false, "i18n_template": "gender" }, { @@ -1582,7 +1596,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -1822,12 +1836,19 @@ }, "person_2_under_retirement_value_check": { "depends_on": [{ "person_2_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_2", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex2", - "label": true, + "key": "plural_gender_for_person_2", + "label": false, "i18n_template": "gender" }, { @@ -1840,7 +1861,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -1855,12 +1876,19 @@ }, "person_2_over_retirement_value_check": { "depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_2", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex2", - "label": true, + "key": "plural_gender_for_person_2", + "label": false, "i18n_template": "gender" }, { @@ -1873,7 +1901,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2110,12 +2138,19 @@ }, "person_3_under_retirement_value_check": { "depends_on": [{ "person_3_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_3", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex3", - "label": true, + "key": "plural_gender_for_person_3", + "label": false, "i18n_template": "gender" }, { @@ -2128,7 +2163,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2143,12 +2178,19 @@ }, "person_3_over_retirement_value_check": { "depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_3", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex3", - "label": true, + "key": "plural_gender_for_person_3", + "label": false, "i18n_template": "gender" }, { @@ -2161,7 +2203,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2395,12 +2437,19 @@ }, "person_4_under_retirement_value_check": { "depends_on": [{ "person_4_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_4", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex4", - "label": true, + "key": "plural_gender_for_person_4", + "label": false, "i18n_template": "gender" }, { @@ -2413,7 +2462,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2428,12 +2477,19 @@ }, "person_4_over_retirement_value_check": { "depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_4", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex4", - "label": true, + "key": "plural_gender_for_person_4", + "label": false, "i18n_template": "gender" }, { @@ -2446,7 +2502,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2677,12 +2733,19 @@ }, "person_5_under_retirement_value_check": { "depends_on": [{ "person_5_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_5", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex5", - "label": true, + "key": "plural_gender_for_person_5", + "label": false, "i18n_template": "gender" }, { @@ -2695,7 +2758,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2710,12 +2773,19 @@ }, "person_5_over_retirement_value_check": { "depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_5", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex5", - "label": true, + "key": "plural_gender_for_person_5", + "label": false, "i18n_template": "gender" }, { @@ -2728,7 +2798,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2956,12 +3026,19 @@ }, "person_6_under_retirement_value_check": { "depends_on": [{ "person_6_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_6", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex6", - "label": true, + "key": "plural_gender_for_person_6", + "label": false, "i18n_template": "gender" }, { @@ -2974,7 +3051,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2989,12 +3066,19 @@ }, "person_6_over_retirement_value_check": { "depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_6", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex6", - "label": true, + "key": "plural_gender_for_person_6", + "label": false, "i18n_template": "gender" }, { @@ -3007,7 +3091,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -3232,12 +3316,19 @@ }, "person_7_under_retirement_value_check": { "depends_on": [{ "person_7_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_7", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex7", - "label": true, + "key": "plural_gender_for_person_7", + "label": false, "i18n_template": "gender" }, { @@ -3250,7 +3341,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -3265,12 +3356,19 @@ }, "person_7_over_retirement_value_check": { "depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_7", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex7", - "label": true, + "key": "plural_gender_for_person_7", + "label": false, "i18n_template": "gender" }, { @@ -3283,7 +3381,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -3505,12 +3603,19 @@ }, "person_8_under_retirement_value_check": { "depends_on": [{ "person_8_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_8", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex8", - "label": true, + "key": "plural_gender_for_person_8", + "label": false, "i18n_template": "gender" }, { @@ -3523,7 +3628,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -3538,12 +3643,19 @@ }, "person_8_over_retirement_value_check": { "depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_8", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex8", - "label": true, + "key": "plural_gender_for_person_8", + "label": false, "i18n_template": "gender" }, { @@ -3556,7 +3668,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index ccd4a8458..86280cf7c 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -1525,12 +1525,19 @@ }, "lead_tenant_under_retirement_value_check": { "depends_on": [{ "person_1_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_1", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex1", - "label": true, + "key": "plural_gender_for_person_1", + "label": false, "i18n_template": "gender" }, { @@ -1543,7 +1550,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -1558,12 +1565,19 @@ }, "lead_tenant_over_retirement_value_check": { "depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_1", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex1", - "label": true, + "key": "plural_gender_for_person_1", + "label": false, "i18n_template": "gender" }, { @@ -1576,7 +1590,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -1821,14 +1835,21 @@ } ] }, - "person_2_under_retirement_value_check": { + "person_2_under_retirement_value_check": { "depends_on": [{ "person_2_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_2", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex2", - "label": true, + "key": "plural_gender_for_person_2", + "label": false, "i18n_template": "gender" }, { @@ -1841,7 +1862,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -1856,12 +1877,19 @@ }, "person_2_over_retirement_value_check": { "depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_2", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex2", - "label": true, + "key": "plural_gender_for_person_2", + "label": false, "i18n_template": "gender" }, { @@ -1874,7 +1902,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2118,12 +2146,19 @@ }, "person_3_under_retirement_value_check": { "depends_on": [{ "person_3_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_3", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex3", - "label": true, + "key": "plural_gender_for_person_3", + "label": false, "i18n_template": "gender" }, { @@ -2136,7 +2171,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2151,12 +2186,19 @@ }, "person_3_over_retirement_value_check": { "depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_3", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex3", - "label": true, + "key": "plural_gender_for_person_3", + "label": false, "i18n_template": "gender" }, { @@ -2169,7 +2211,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2410,12 +2452,19 @@ }, "person_4_under_retirement_value_check": { "depends_on": [{ "person_4_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_4", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex4", - "label": true, + "key": "plural_gender_for_person_4", + "label": false, "i18n_template": "gender" }, { @@ -2428,7 +2477,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2443,12 +2492,19 @@ }, "person_4_over_retirement_value_check": { "depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_4", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex4", - "label": true, + "key": "plural_gender_for_person_4", + "label": false, "i18n_template": "gender" }, { @@ -2461,7 +2517,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2699,12 +2755,19 @@ }, "person_5_under_retirement_value_check": { "depends_on": [{ "person_5_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_5", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex5", - "label": true, + "key": "plural_gender_for_person_5", + "label": false, "i18n_template": "gender" }, { @@ -2717,7 +2780,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -2732,12 +2795,19 @@ }, "person_5_over_retirement_value_check": { "depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_5", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex5", - "label": true, + "key": "plural_gender_for_person_5", + "label": false, "i18n_template": "gender" }, { @@ -2750,7 +2820,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -2985,12 +3055,19 @@ }, "person_6_under_retirement_value_check": { "depends_on": [{ "person_6_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_6", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex6", - "label": true, + "key": "plural_gender_for_person_6", + "label": false, "i18n_template": "gender" }, { @@ -3003,7 +3080,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -3018,12 +3095,19 @@ }, "person_6_over_retirement_value_check": { "depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_6", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex6", - "label": true, + "key": "plural_gender_for_person_6", + "label": false, "i18n_template": "gender" }, { @@ -3036,7 +3120,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -3048,7 +3132,7 @@ } } } - }, + }, "person_7_known": { "header": "You’ve given us the details for 7 people in the household", "description": "", @@ -3268,12 +3352,19 @@ }, "person_7_under_retirement_value_check": { "depends_on": [{ "person_7_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_7", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex7", - "label": true, + "key": "plural_gender_for_person_7", + "label": false, "i18n_template": "gender" }, { @@ -3286,7 +3377,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -3301,12 +3392,19 @@ }, "person_7_over_retirement_value_check": { "depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_7", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex7", - "label": true, + "key": "plural_gender_for_person_7", + "label": false, "i18n_template": "gender" }, { @@ -3319,7 +3417,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { @@ -3548,12 +3646,19 @@ }, "person_8_under_retirement_value_check": { "depends_on": [{ "person_8_retired_under_soft_min_age?": true }], - "title_text": "soft_validations.retirement.min.title", + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [{ + "key": "retirement_age_for_person_8", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.min.hint_text", "arguments": [{ - "key": "sex8", - "label": true, + "key": "plural_gender_for_person_8", + "label": false, "i18n_template": "gender" }, { @@ -3566,7 +3671,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired?", "type": "interruption_screen", "answer_options": { "0": { @@ -3581,12 +3686,19 @@ }, "person_8_over_retirement_value_check": { "depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }], - "title_text": "soft_validations.retirement.max.title", + "title_text": { + "translation": "soft_validations.retirement.max.title", + "arguments": [{ + "key": "retirement_age_for_person_8", + "label": false, + "i18n_template": "age" + }] + }, "informative_text": { "translation": "soft_validations.retirement.max.hint_text", "arguments": [{ - "key": "sex8", - "label": true, + "key": "plural_gender_for_person_8", + "label": false, "i18n_template": "gender" }, { @@ -3599,7 +3711,7 @@ "retirement_value_check": { "check_answer_label": "Retirement age soft validation", "hidden_in_check_answers": true, - "header": "Are you sure this is correct?", + "header": "Are you sure this person isn’t retired??", "type": "interruption_screen", "answer_options": { "0": { diff --git a/config/locales/en.yml b/config/locales/en.yml index c40ef0535..6d14db2c5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -243,11 +243,11 @@ en: hint_text: "

You told us the rent is %{brent}

The maximum rent for this type of property in %{la} is £%{soft_max_for_period}.

" retirement: min: - title: "Age is below the expected range based on the person being retired" - hint_text: "This person cannot be retired as you told us they're %{gender} and under %{age}" + title: "You told us this person is under %{age} and retired" + hint_text: "The minimum expected retirement age for %{gender} in England is %{age}." max: - title: "Age is above the expected range based on the person not being retired" - hint_text: "This person must be retired as you told us they're %{gender} and over %{age}" + title: "You told us this person is %{age} or over and not retired" + hint_text: "The minimum expected retirement age for %{gender} in England is %{age}" devise: two_factor_authentication: @@ -262,3 +262,6 @@ en: test: one_argument: "This is based on the tenant’s work situation: %{ecstat1}" + title_text: + no_argument: "Some test text" + one_argument: "You said this: %{ecstat1}" diff --git a/spec/helpers/interruption_screen_helper_spec.rb b/spec/helpers/interruption_screen_helper_spec.rb index 13633a0c3..d46416c80 100644 --- a/spec/helpers/interruption_screen_helper_spec.rb +++ b/spec/helpers/interruption_screen_helper_spec.rb @@ -96,4 +96,31 @@ RSpec.describe InterruptionScreenHelper do end end end + + describe "display_title_text" do + context "when title text has no arguments" do + it "returns the correct title text" do + title_text = "test.title_text.no_argument" + expect(display_title_text(title_text, case_log)) + .to eq(I18n.t("test.title_text.no_argument")) + end + end + + context "when title text has arguments" do + it "returns the correct title text" do + title_text = { + "translation" => "test.title_text.one_argument", + "arguments" => [ + { + "key" => "ecstat1", + "label" => true, + "i18n_template" => "ecstat1", + }, + ], + } + expect(display_title_text(title_text, case_log)) + .to eq(I18n.t("test.title_text.one_argument", ecstat1: case_log.form.get_question("ecstat1", case_log).answer_label(case_log).downcase)) + end + end + end end