Change merge of lettings setup.en.yml

config/locales/validations/lettings/setup.en.yml

@@ -21,6 +21,33 @@ en:
             owning_organisation: "Enter a date when the owning organisation was active. %{owning_organisation} became active on %{available_from}."
             managing_organisation: "Enter a date when the managing organisation was active. %{managing_organisation} became active on %{available_from}."
             different_organisations: "Enter a date when the owning and managing organisations were active. %{owning_organisation} became active on %{owning_organisation_active_from}, and %{managing_organisation} became active on %{managing_organisation_active_from}."
+          location:
+            deactivated:
+              startdate: "The location %{postcode} is inactive on this date. Enter another date or choose another location."
+              location_id: "This location is not active on the tenancy start date. Choose another location or edit the tenancy start date."
+            activating_soon:
+              startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
+              location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
+            reactivating_soon:
+              startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
+              location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
+          scheme:
+            deactivated:
+              startdate: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
+              scheme_id: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
+            reactivating_soon:
+              startdate: "The scheme %{name} is not available until %{date}. Enter a tenancy start date after %{date}."
+              scheme_id: "The scheme %{name} is not available until %{date}. Select another scheme or edit the tenancy start date."
+            locations_inactive:
+              startdate: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
+              scheme_id: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
+
+        scheme:
+          incomplete: "This scheme is incomplete. Select another scheme or update this one."
+          no_completed_locations: "This scheme cannot be chosen as it has no completed locations."
+
+        location:
+          incomplete: "This location is incomplete. Select another location or update this one."
 
         assigned_to:
           invalid: "Please select the owning organisation or managing organisation that you belong to."
@@ -44,27 +71,3 @@ en:
 
         intermediate_rent_product_name:
           blank: "Enter name of other intermediate rent product."
-
-        location:
-          incomplete: "This location is incomplete. Select another location or update this one."
-          deactivated:
-            startdate: "The location %{postcode} is inactive on this date. Enter another date or choose another location."
-            location_id: "This location is not active on the tenancy start date. Choose another location or edit the tenancy start date."
-          activating_soon:
-            startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
-            location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
-          reactivating_soon:
-            startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
-            location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
-        scheme:
-          incomplete: "This scheme is incomplete. Select another scheme or update this one."
-          no_completed_locations: "This scheme cannot be chosen as it has no completed locations."
-          deactivated:
-            startdate: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
-            scheme_id: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
-          reactivating_soon:
-            startdate: "The scheme %{name} is not available until %{date}. Enter a tenancy start date after %{date}."
-            scheme_id: "The scheme %{name} is not available until %{date}. Select another scheme or edit the tenancy start date."
-          locations_inactive:
-            startdate: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
-            scheme_id: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."