From 7c23725bbd50e77503c2eb6b8fba9f48258d527d Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 9 Aug 2011 15:59:24 -0700 Subject: [PATCH] [#6441] Refactor: merge i18n strings by passing in a reason and object --- config/locales/en.yml | 5 +---- lib/redmine_contracts/patches/time_entry_patch.rb | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 85aaa5e..ddaeb5e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,10 +2,7 @@ en: activerecord: errors: messages: - cant_create_time_on_closed_deliverable: "Can't create a time entry on a closed deliverable" - cant_create_time_on_closed_contract: "Can't create a time entry on a closed contract" - cant_create_time_on_locked_deliverable: "Can't create a time entry on a locked deliverable" - cant_create_time_on_locked_contract: "Can't create a time entry on a locked contract" + cant_create_time_on_object: "Can't create a time entry on a %{reason} %{thing}" cant_assign_to_closed_deliverable: "Can't assign issue to a closed deliverable" cant_assign_to_locked_deliverable: "Can't assign issue to a locked deliverable" cant_update_locked_deliverable: "Can't update a locked deliverable" diff --git a/lib/redmine_contracts/patches/time_entry_patch.rb b/lib/redmine_contracts/patches/time_entry_patch.rb index b3ce8a7..cca2541 100644 --- a/lib/redmine_contracts/patches/time_entry_patch.rb +++ b/lib/redmine_contracts/patches/time_entry_patch.rb @@ -13,15 +13,15 @@ module RedmineContracts def validate_deliverable_status if issue.present? && issue.deliverable.present? - errors.add_to_base(:cant_create_time_on_locked_deliverable) if issue.deliverable.locked? - errors.add_to_base(:cant_create_time_on_closed_deliverable) if issue.deliverable.closed? + errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'locked', :thing => 'deliverable')}") if issue.deliverable.locked? + errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'closed', :thing => 'deliverable')}") if issue.deliverable.closed? end end def validate_contract_status if issue.present? && issue.deliverable.present? && issue.deliverable.contract.present? - errors.add_to_base(:cant_create_time_on_locked_contract) if issue.deliverable.contract.locked? - errors.add_to_base(:cant_create_time_on_closed_contract) if issue.deliverable.contract.closed? + errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'locked', :thing => 'contract')}") if issue.deliverable.contract.locked? + errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'closed', :thing => 'contract')}") if issue.deliverable.contract.closed? end end