From 00d5c38d6ef48b07c3d1f8d4e43942ce8bfed59c Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:36:44 +0100 Subject: [PATCH] Rename as property_information.en.yml and all usages --- app/models/form/sales/pages/address.rb | 2 +- app/models/form/sales/pages/address_fallback.rb | 2 +- app/models/form/sales/pages/address_matcher.rb | 2 +- app/models/form/sales/questions/address_line1.rb | 2 +- .../form/sales/questions/address_line1_for_address_matcher.rb | 2 +- app/models/form/sales/questions/address_line2.rb | 2 +- app/models/form/sales/questions/county.rb | 2 +- app/models/form/sales/questions/postcode_for_address_matcher.rb | 2 +- app/models/form/sales/questions/postcode_for_full_address.rb | 2 +- app/models/form/sales/questions/property_building_type.rb | 2 +- app/models/form/sales/questions/property_number_of_bedrooms.rb | 2 +- app/models/form/sales/questions/property_unit_type.rb | 2 +- .../form/sales/questions/property_wheelchair_accessible.rb | 2 +- app/models/form/sales/questions/town_or_city.rb | 2 +- .../2023/sales/{property.en.yml => property_information.en.yml} | 2 +- .../2024/sales/{property.en.yml => property_information.en.yml} | 0 16 files changed, 15 insertions(+), 15 deletions(-) rename config/locales/forms/2023/sales/{property.en.yml => property_information.en.yml} (98%) rename config/locales/forms/2024/sales/{property.en.yml => property_information.en.yml} (100%) diff --git a/app/models/form/sales/pages/address.rb b/app/models/form/sales/pages/address.rb index 6c83aabdc..be0ed9eae 100644 --- a/app/models/form/sales/pages/address.rb +++ b/app/models/form/sales/pages/address.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::Address < ::Form::Page def initialize(id, hsh, subsection) super @id = "address" - @copy_key = "sales.property.address" + @copy_key = "sales.property_information.address" @depends_on = [ { "uprn_known" => nil }, { "uprn_known" => 0 }, diff --git a/app/models/form/sales/pages/address_fallback.rb b/app/models/form/sales/pages/address_fallback.rb index 449dc5a40..1f0a3f1e8 100644 --- a/app/models/form/sales/pages/address_fallback.rb +++ b/app/models/form/sales/pages/address_fallback.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressFallback < ::Form::Page def initialize(id, hsh, subsection) super @id = "address" - @copy_key = "sales.property.address" + @copy_key = "sales.property_information.address" @depends_on = [ { "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" }, { "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" }, diff --git a/app/models/form/sales/pages/address_matcher.rb b/app/models/form/sales/pages/address_matcher.rb index 8e1a8e272..23b8c5c86 100644 --- a/app/models/form/sales/pages/address_matcher.rb +++ b/app/models/form/sales/pages/address_matcher.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page def initialize(id, hsh, subsection) super @id = "address_matcher" - @copy_key = "sales.property.address_matcher" + @copy_key = "sales.property_information.address_matcher" @depends_on = [ { "uprn_known" => nil }, { "uprn_known" => 0 }, diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb index 217e0c69b..f7a4c7c2d 100644 --- a/app/models/form/sales/questions/address_line1.rb +++ b/app/models/form/sales/questions/address_line1.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question def initialize(id, hsh, page) super @id = "address_line1" - @copy_key = "sales.property.address.address_line1" + @copy_key = "sales.property_information.address.address_line1" @error_label = "Address line 1" @type = "text" @plain_label = true diff --git a/app/models/form/sales/questions/address_line1_for_address_matcher.rb b/app/models/form/sales/questions/address_line1_for_address_matcher.rb index c23b8cab3..cfc086f7b 100644 --- a/app/models/form/sales/questions/address_line1_for_address_matcher.rb +++ b/app/models/form/sales/questions/address_line1_for_address_matcher.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::AddressLine1ForAddressMatcher < ::Form::Question def initialize(id, hsh, page) super @id = "address_line1_input" - @copy_key = "sales.property.address_matcher.address_line1_input" + @copy_key = "sales.property_information.address_matcher.address_line1_input" @error_label = "Address line 1" @type = "text" @plain_label = true diff --git a/app/models/form/sales/questions/address_line2.rb b/app/models/form/sales/questions/address_line2.rb index 4a1cc643b..521d1dc58 100644 --- a/app/models/form/sales/questions/address_line2.rb +++ b/app/models/form/sales/questions/address_line2.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::AddressLine2 < ::Form::Question def initialize(id, hsh, page) super @id = "address_line2" - @copy_key = "sales.property.address.address_line2" + @copy_key = "sales.property_information.address.address_line2" @type = "text" @plain_label = true @disable_clearing_if_not_routed_or_dynamic_answer_options = true diff --git a/app/models/form/sales/questions/county.rb b/app/models/form/sales/questions/county.rb index d9e0d14ae..8f92a5480 100644 --- a/app/models/form/sales/questions/county.rb +++ b/app/models/form/sales/questions/county.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::County < ::Form::Question def initialize(id, hsh, page) super @id = "county" - @copy_key = "sales.property.address.county" + @copy_key = "sales.property_information.address.county" @type = "text" @plain_label = true @disable_clearing_if_not_routed_or_dynamic_answer_options = true diff --git a/app/models/form/sales/questions/postcode_for_address_matcher.rb b/app/models/form/sales/questions/postcode_for_address_matcher.rb index d520538b2..945bdc2ad 100644 --- a/app/models/form/sales/questions/postcode_for_address_matcher.rb +++ b/app/models/form/sales/questions/postcode_for_address_matcher.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PostcodeForAddressMatcher < ::Form::Question def initialize(id, hsh, page) super @id = "postcode_full_input" - @copy_key = "sales.property.address_matcher.postcode_full_input" + @copy_key = "sales.property_information.address_matcher.postcode_full_input" @type = "text" @width = 5 @plain_label = true diff --git a/app/models/form/sales/questions/postcode_for_full_address.rb b/app/models/form/sales/questions/postcode_for_full_address.rb index c6ed883a0..34fbea00b 100644 --- a/app/models/form/sales/questions/postcode_for_full_address.rb +++ b/app/models/form/sales/questions/postcode_for_full_address.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question def initialize(id, hsh, page) super @id = "postcode_full" - @copy_key = "sales.property.address.postcode_full" + @copy_key = "sales.property_information.address.postcode_full" @type = "text" @width = 5 @inferred_check_answers_value = [{ diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb index 036864be3..42b65a57a 100644 --- a/app/models/form/sales/questions/property_building_type.rb +++ b/app/models/form/sales/questions/property_building_type.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question def initialize(id, hsh, page) super @id = "builtype" - @copy_key = "sales.property.builtype" + @copy_key = "sales.property_information.builtype" @type = "radio" @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb index e3cf38fec..c394fe334 100644 --- a/app/models/form/sales/questions/property_number_of_bedrooms.rb +++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question def initialize(id, hsh, page) super @id = "beds" - @copy_key = "sales.property.beds" + @copy_key = "sales.property_information.beds" @type = "numeric" @width = 2 @min = 1 diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb index 55fb34315..45e935941 100644 --- a/app/models/form/sales/questions/property_unit_type.rb +++ b/app/models/form/sales/questions/property_unit_type.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question def initialize(id, hsh, page) super @id = "proptype" - @copy_key = "sales.property.proptype" + @copy_key = "sales.property_information.proptype" @type = "radio" @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb index b418d9bd7..6a36be6f6 100644 --- a/app/models/form/sales/questions/property_wheelchair_accessible.rb +++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question def initialize(id, hsh, page) super @id = "wchair" - @copy_key = "sales.property.wchair" + @copy_key = "sales.property_information.wchair" @type = "radio" @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/town_or_city.rb b/app/models/form/sales/questions/town_or_city.rb index fd3ebe5e8..9536c024f 100644 --- a/app/models/form/sales/questions/town_or_city.rb +++ b/app/models/form/sales/questions/town_or_city.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::TownOrCity < ::Form::Question def initialize(id, hsh, page) super @id = "town_or_city" - @copy_key = "sales.property.address.town_or_city" + @copy_key = "sales.property_information.address.town_or_city" @type = "text" @plain_label = true @disable_clearing_if_not_routed_or_dynamic_answer_options = true diff --git a/config/locales/forms/2023/sales/property.en.yml b/config/locales/forms/2023/sales/property_information.en.yml similarity index 98% rename from config/locales/forms/2023/sales/property.en.yml rename to config/locales/forms/2023/sales/property_information.en.yml index 967b6e8d1..4a7b42389 100644 --- a/config/locales/forms/2023/sales/property.en.yml +++ b/config/locales/forms/2023/sales/property_information.en.yml @@ -2,7 +2,7 @@ en: forms: 2023: sales: - property: + property_information: uprn: page_header: "" check_answer_label: "UPRN" diff --git a/config/locales/forms/2024/sales/property.en.yml b/config/locales/forms/2024/sales/property_information.en.yml similarity index 100% rename from config/locales/forms/2024/sales/property.en.yml rename to config/locales/forms/2024/sales/property_information.en.yml