Browse Source

Remove saledate repetition

pull/2677/head
Manny Dinssa 2 years ago
parent
commit
7d234c7adb
  1. 4
      app/models/validations/sales/setup_validations.rb
  2. 4
      config/locales/validations/sales/setup/en.yml

4
app/models/validations/sales/setup_validations.rb

@ -28,14 +28,14 @@ module Validations::Sales::SetupValidations
return unless record.saledate && date_valid?("saledate", record)
if merged_owning_organisation_inactive?(record)
record.errors.add :saledate, I18n.t("validations.sales.setup.saledate.invalid.merged_organisations_saledate",
record.errors.add :saledate, I18n.t("validations.sales.setup.saledate.invalid.merged_organisations",
owning_organisation: record.owning_organisation.name,
merge_date: record.owning_organisation.merge_date.to_formatted_s(:govuk_date),
absorbing_organisation: record.owning_organisation.absorbing_organisation.name)
end
if absorbing_owning_organisation_inactive?(record)
record.errors.add :saledate, I18n.t("validations.sales.setup.saledate.invalid.absorbing_organisations_saledate",
record.errors.add :saledate, I18n.t("validations.sales.setup.saledate.invalid.absorbing_organisations",
owning_organisation: record.owning_organisation.name,
available_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date))
end

4
config/locales/validations/sales/setup/en.yml

@ -10,9 +10,9 @@ en:
previous_and_current_collection_year:
"Enter a date within the %{previous_start_year_short}/%{previous_end_year_short} or %{previous_end_year_short}/%{current_end_year_short} collection years, which is between %{previous_start_year_long} and %{current_end_year_long}."
invalid:
merged_organisations_saledate:
merged_organisations:
"Enter a date when the owning organisation was active. %{owning_organisation} became inactive on %{merge_date} and was replaced by %{absorbing_organisation}."
absorbing_organisations_saledate:
absorbing_organisations:
"Enter a date when the owning organisation was active. %{owning_organisation} became active on %{available_from}."
owning_organisation:

Loading…
Cancel
Save