<%= link_to t('.manual_entry'), edit_steps_address_details_path %> diff --git a/app/views/steps/address/results/edit.html.erb b/app/views/steps/address/results/edit.html.erb index a118adff1..d4ad041ce 100644 --- a/app/views/steps/address/results/edit.html.erb +++ b/app/views/steps/address/results/edit.html.erb @@ -11,9 +11,7 @@
- <%=t '.current_postcode' %> -
+<%= @form_object.postcode %> diff --git a/config/locales/en/helpers.yml b/config/locales/en/helpers.yml index 9a3e1b7b6..572de3ce5 100644 --- a/config/locales/en/helpers.yml +++ b/config/locales/en/helpers.yml @@ -78,7 +78,7 @@ en: steps_client_has_partner_form: has_partner: Does your client have a partner? steps_client_details_form: - date_of_birth: Date of birth + date_of_birth: What is their date of birth? steps_client_case_type_form: case_type: What is the case type? steps_shared_nino_form: @@ -93,9 +93,9 @@ en: steps_client_relationship_status_form: relationship_status: What is your client's relationship status? steps_partner_relationship_form: - relationship_to_partner: What is the client’s relationship to their partner? + relationship_to_partner: What is your client’s relationship to their partner? steps_partner_details_form: - date_of_birth: Date of birth + date_of_birth: What is the partner's date of birth? steps_partner_involvement_form: involvement_in_case: Is the partner involved in your client’s case? steps_partner_conflict_form: @@ -398,9 +398,12 @@ en: separation_date: steps_client_details_form: other_names: This includes aliases, nicknames or other names your client may be known as. - date_of_birth: For example, 27 3 2007 + date_of_birth: For example, 27 3 2007. + steps_partner_details_form: + other_names: This includes aliases, nicknames or other names they may be known as. + date_of_birth: For example, 27 3 2007. steps_client_appeal_details_form: - appeal_lodged_date: For example, 27 3 2007 + appeal_lodged_date: For example, 27 3 2007. appeal_original_app_submitted: This is the case with the outcome your client wants to appeal. steps_client_appeal_reference_number_form: appeal_reference_number: We need either your client's MAAT ID or unique submission number (USN). @@ -435,16 +438,16 @@ en: steps_case_urn_form: urn: For example, ‘12 AB 3456789’. steps_case_has_case_concluded_form: - date_case_concluded: For example, 27 3 2007 + date_case_concluded: For example, 27 3 2007. steps_case_is_preorder_work_claimed_form: - preorder_work_date: For example, 27 3 2007 + preorder_work_date: For example, 27 3 2007. preorder_work_details: Enter details about the urgency of the work steps_case_is_client_remanded_form: - date_client_remanded: For example, 27 3 2007 + date_client_remanded: For example, 27 3 2007. steps_case_charges_form: offence_name: Start typing to select an offence, for example, robbery. You can add more later. offence_dates_attributes: - date_from: For example, 27 3 2007 + date_from: For example, 27 3 2007. date_to: Leave blank if the offence happened on a single date steps_case_hearing_details_form: hearing_court_name: Start typing to add a court. For example, Cardiff Crown Court. @@ -489,7 +492,7 @@ en: partner_self_assessment_tax_bill: This will be from HM Revenue and Customs (HMRC). partner_self_assessment_tax_bill_amount: Enter '0' if none. steps_income_lost_job_in_custody_form: - date_job_lost: For example, 27 3 2007 + date_job_lost: For example, 27 3 2007. steps_income_income_payments_form: income_payments: Select all that apply. types_options: @@ -519,7 +522,7 @@ en: steps_income_business_type_form: business_type: You can add more later. steps_income_business_start_date_form: - trading_start_date: For example, 27 3 2007 + trading_start_date: For example, 27 3 2007. steps_income_business_employees_form: has_employees: Enter if they have employees, not including themself. steps_income_business_financials_form: @@ -594,7 +597,7 @@ en: steps_client_details_form: first_name: First name last_name: Last name - other_names: Other names (optional) + other_names: Are they known by any other names? (optional) steps_client_case_type_form: case_type_options: summary_only: Summary only @@ -654,7 +657,7 @@ en: steps_partner_details_form: first_name: First name last_name: Last name - other_names: Other names (optional) + other_names: Are they known by any other names? (optional) steps_partner_involvement_form: involvement_in_case_options: victim: Victim @@ -698,7 +701,7 @@ en: 'no': 'No, I need to change these details' steps_dwp_confirm_partner_details_form: *CONFIRM_DETAILS_OPTIONS steps_address_lookup_form: - postcode: Postcode + postcode: What is the postcode? steps_address_results_form: lookup_id: Select an address steps_address_details_form: *ADDRESS_DETAILS diff --git a/config/locales/en/steps.yml b/config/locales/en/steps.yml index eb480ca5b..8f0ea4df1 100644 --- a/config/locales/en/steps.yml +++ b/config/locales/en/steps.yml @@ -48,9 +48,9 @@ en: page_title: Use eForms for this application details: edit: - page_title: Enter your client’s details - heading: Enter your client’s details - full_name_legend: Client’s full name + page_title: Your client’s details + heading: Your client’s details + full_name_legend: What is their full name? case_type: edit: page_title: What is the case type? @@ -85,12 +85,12 @@ en: partner: relationship: edit: - page_title: What is the client’s relationship to their partner? + page_title: What is your client’s relationship to their partner? details: edit: - page_title: Enter the partner’s details - heading: Enter the partner’s details - full_name_legend: Partner’s full name + page_title: The partner’s details + heading: The partner’s details + full_name_legend: What is the partner's full name? nino: edit: page_title: Does the partner have a National Insurance number? @@ -161,10 +161,10 @@ en: home_address: Partner’s home address heading: applicant: - home_address: Enter the address where your client usually lives - correspondence_address: Enter your client’s correspondence address + home_address: The address where your client usually lives + correspondence_address: Your client’s correspondence address partner: - home_address: Enter the address where the partner usually lives + home_address: The address where the partner usually lives manual_entry: Enter address manually results: edit: @@ -176,10 +176,10 @@ en: home_address: Partner’s home address selection heading: applicant: - home_address: Enter the address where your client usually lives - correspondence_address: Enter your client’s correspondence address + home_address: The address where your client usually lives + correspondence_address: Your client’s correspondence address partner: - home_address: Enter the address where the partner usually lives + home_address: The address where the partner usually lives current_postcode: Postcode change_postcode_html: Change postcode address_not_listed: I can’t find the address in the list @@ -199,11 +199,12 @@ en: home_address: Partner’s home address heading: applicant: - home_address: Enter your client’s home address - correspondence_address: Enter your client’s correspondence address + home_address: The address where your client usually lives + correspondence_address: Your client’s correspondence address partner: - home_address: Enter your partner’s home address + home_address: The address where the partner usually lives correspondence_address: Enter your partner’s correspondence address + subheading: What is the address? case: urn: @@ -269,7 +270,7 @@ en: charge_label: What is the charge? (optional) hearing_court_name_label: Which court is hearing the case? (optional) hearing_date_legend: When is the next hearing? (optional) - hearing_date_hint: For example, 27 3 2007 + hearing_date_hint: For example, 27 3 2007. hearing_details: edit: page_title: Next hearing court details diff --git a/spec/support/shared_contexts/means_tested_with_partner.rb b/spec/support/shared_contexts/means_tested_with_partner.rb index 97a7ab79c..7ec1c1e92 100644 --- a/spec/support/shared_contexts/means_tested_with_partner.rb +++ b/spec/support/shared_contexts/means_tested_with_partner.rb @@ -16,7 +16,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 19.years.ago.to_date) + fill_date('What is their date of birth?', with: 19.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested @@ -49,13 +49,13 @@ save_and_continue # steps/client/client_relationship_to_partner - choose_answer('What is the client’s relationship to their partner?', 'Living together') + choose_answer('What is your client’s relationship to their partner?', 'Living together') save_and_continue # steps/partner/partner_details fill_in('First name', with: 'John') fill_in('Last name', with: 'Huffman') - fill_date('Date of birth', with: 19.years.ago.to_date) + fill_date("What is the partner's date of birth?", with: 19.years.ago.to_date) save_and_continue # steps/partner/partner_involved_in_case diff --git a/spec/system/applying/appeal_to_crown_court_spec.rb b/spec/system/applying/appeal_to_crown_court_spec.rb index d2ab89ab3..a852fcd1d 100644 --- a/spec/system/applying/appeal_to_crown_court_spec.rb +++ b/spec/system/applying/appeal_to_crown_court_spec.rb @@ -16,7 +16,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 30.years.ago.to_date) + fill_date('What is their date of birth?', with: 30.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested diff --git a/spec/system/applying/appeal_to_crown_court_with_changes_spec.rb b/spec/system/applying/appeal_to_crown_court_with_changes_spec.rb index b70797d67..4256475a6 100644 --- a/spec/system/applying/appeal_to_crown_court_with_changes_spec.rb +++ b/spec/system/applying/appeal_to_crown_court_with_changes_spec.rb @@ -16,7 +16,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 30.years.ago.to_date) + fill_date('What is their date of birth?', with: 30.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested diff --git a/spec/system/applying/change_in_financial_circumstances_spec.rb b/spec/system/applying/change_in_financial_circumstances_spec.rb index 84cd2c029..67eb8fd51 100644 --- a/spec/system/applying/change_in_financial_circumstances_spec.rb +++ b/spec/system/applying/change_in_financial_circumstances_spec.rb @@ -22,7 +22,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 30.years.ago.to_date) + fill_date('What is their date of birth?', with: 30.years.ago.to_date) save_and_continue # steps/client/case_type diff --git a/spec/system/applying/full_means_assessment/employed_client_with_self_employed_partner_spec.rb b/spec/system/applying/full_means_assessment/employed_client_with_self_employed_partner_spec.rb index 5e40900ce..9a187a222 100644 --- a/spec/system/applying/full_means_assessment/employed_client_with_self_employed_partner_spec.rb +++ b/spec/system/applying/full_means_assessment/employed_client_with_self_employed_partner_spec.rb @@ -18,7 +18,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 30.years.ago.to_date) + fill_date('What is their date of birth?', with: 30.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested @@ -51,13 +51,13 @@ save_and_continue # steps/client/client_relationship_to_partner - choose_answer('What is the client’s relationship to their partner?', 'Living together') + choose_answer('What is your client’s relationship to their partner?', 'Living together') save_and_continue # steps/partner/partner_details fill_in('First name', with: 'John') fill_in('Last name', with: 'Huffman') - fill_date('Date of birth', with: 30.years.ago.to_date) + fill_date("What is the partner's date of birth?", with: 30.years.ago.to_date) save_and_continue # steps/partner/partner_involved_in_case diff --git a/spec/system/applying/non_means_tested_spec.rb b/spec/system/applying/non_means_tested_spec.rb index 838cdded9..619350306 100644 --- a/spec/system/applying/non_means_tested_spec.rb +++ b/spec/system/applying/non_means_tested_spec.rb @@ -16,7 +16,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 19.years.ago.to_date) + fill_date('What is their date of birth?', with: 19.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested diff --git a/spec/system/applying/passported_on_age_spec.rb b/spec/system/applying/passported_on_age_spec.rb index e558e406f..2210834da 100644 --- a/spec/system/applying/passported_on_age_spec.rb +++ b/spec/system/applying/passported_on_age_spec.rb @@ -16,7 +16,7 @@ # steps/client/details fill_in('First name', with: 'Jo') fill_in('Last name', with: 'Bloggs') - fill_date('Date of birth', with: 17.years.ago.to_date) + fill_date('What is their date of birth?', with: 17.years.ago.to_date) save_and_continue # steps/client/is_application_means_tested